summaryrefslogtreecommitdiffabout
path: root/microkde
Side-by-side diff
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kglobal.cpp10
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,2 +1,3 @@
#include "kglobal.h"
+#include "kstandarddirs.h"
#include <qkeycode.h>
@@ -30,4 +31,11 @@ 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;
}