From eb161bde338263235bed3e135050bca4712e6f74 Mon Sep 17 00:00:00 2001 From: Wim van der Meer Date: Sun, 20 Jun 2010 04:31:37 +0000 Subject: [PATCH] BCatalog was used in the wrong way. Fixes ticket #6198. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37183 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/pulse/PulseApp.cpp | 6 ++---- src/apps/pulse/PulseApp.h | 18 +++++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/apps/pulse/PulseApp.cpp b/src/apps/pulse/PulseApp.cpp index 0c3a1bdf2d..6db9c7669b 100644 --- a/src/apps/pulse/PulseApp.cpp +++ b/src/apps/pulse/PulseApp.cpp @@ -37,6 +37,8 @@ PulseApp::PulseApp(int argc, char **argv) : BApplication(APP_SIGNATURE) { + be_locale->GetAppCatalog(&fCatalog); + prefs = new Prefs(); int mini = false, deskbar = false, normal = false; @@ -246,10 +248,6 @@ LoadInDeskbar() int main(int argc, char **argv) { - BCatalog fAppCatalog; - - be_locale->GetAppCatalog(&fAppCatalog); - PulseApp *pulseapp = new PulseApp(argc, argv); pulseapp->Run(); delete pulseapp; diff --git a/src/apps/pulse/PulseApp.h b/src/apps/pulse/PulseApp.h index dc3e7fec2d..59a524e4a1 100644 --- a/src/apps/pulse/PulseApp.h +++ b/src/apps/pulse/PulseApp.h @@ -12,19 +12,23 @@ #define PULSEAPP_H -#include +#include +#include + #include "Prefs.h" class PulseApp : public BApplication { - public: - PulseApp(int argc, char **argv); - ~PulseApp(); +public: + PulseApp(int argc, char **argv); + ~PulseApp(); - Prefs *prefs; + Prefs* prefs; - private: - void BuildPulse(); +private: + void BuildPulse(); + + BCatalog fCatalog; }; extern bool LastEnabledCPU(int cpu);