[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/config
From:       David Faure <faure () kde ! org>
Date:       2010-12-07 23:46:56
Message-ID: 20101207234656.7676EAC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204559 by dfaure:

fix previous commit: both vars must be updated


 M  +4 -3      kconfig.cpp  


--- trunk/KDE/kdelibs/kdecore/config/kconfig.cpp #1204558:1204559
@@ -415,9 +415,10 @@
             file = sGlobalFileName;
         } // else anonymous config.
         // KDE5: remove these magic overloads
-    } else if (QDir::isAbsolutePath(fileName))
-        file = KStandardDirs::realFilePath(fileName);
-    else {
+    } else if (QDir::isAbsolutePath(fileName)) {
+        fileName = KStandardDirs::realFilePath(fileName);
+        file = fileName;
+    } else {
         if (type && *type)
             resourceType = type; // only change it if it's not empty
         file = KStandardDirs::locateLocal(resourceType, fileName, false, componentData);
[prev in list] [next in list] [prev in thread] [next in thread]