| -rw-r--r-- | microkde/kglobal.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp index 0aba952..6fa0dd6 100644 --- a/microkde/kglobal.cpp +++ b/microkde/kglobal.cpp @@ -1,5 +1,6 @@ #include "kglobal.h" +#include "kstandarddirs.h" #include <qkeycode.h> #include <qapplication.h> KLocale *KGlobal::mLocale = 0; @@ -27,10 +28,17 @@ void KGlobal::setLocale(KLocale *kg) } KConfig *KGlobal::config() { + static bool reentrant = false; + + if (reentrant) + return 0; + if ( !mConfig ) { - mConfig = new KConfig( KStandardDirs::appDir() + mAppName + "rc" ); + reentrant = true; + mConfig = new KConfig( locateLocal("config", mAppName + "rc" ) ); + reentrant = false; } return mConfig; } |