From d419ee83db7d2549c701fe89b678be619a7ce4d3 Mon Sep 17 00:00:00 2001
From: ulf69 <ulf69>
Date: Thu, 01 Jul 2004 01:38:10 +0000
Subject: adding reentrant flag, to avoid recursive call

---
(limited to 'microkde/kglobal.cpp')

diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index 0aba952..6fa0dd6 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -1,4 +1,5 @@
 #include "kglobal.h"
+#include "kstandarddirs.h"
 #include <qkeycode.h>
 #include <qapplication.h>
 
@@ -28,8 +29,15 @@ 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;
--
cgit v0.9.0.2