clear path cache after getting a proper config file (fixes #2605)

jonasschnelli · recursive-rat4 · commit 62fe466724b0 · 2014-09-19T16:51:20.000+04:00
Signed-off-by: Jonas Schnelli &lt;jonas.schnelli@include7.ch&gt;

Conflicts:
	src/util.cpp
diff --git a/src/util.cpp b/src/util.cpp
@@ -73,6 +73,7 @@ bool fNoListen = false;
 bool fLogTimestamps = false;
 CMedianFilter<int64_t> vTimeOffsets(200,0);
 bool fReopenDebugLog = false;
+bool fCachedPath[2] = {false, false};
 
 // Init OpenSSL library multithreading support
 static CCriticalSection** ppmutexOpenSSL;
@@ -1018,13 +1019,12 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
 
     static fs::path pathCached[2];
     static CCriticalSection csPathCached;
-    static bool cachedPath[2] = {false, false};
 
     fs::path &path = pathCached[fNetSpecific];
 
     // This can be called during exceptions by printf, so we cache the
     // value so we don't have to do memory allocations after that.
-    if (cachedPath[fNetSpecific])
+    if (fCachedPath[fNetSpecific])
         return path;
 
     LOCK(csPathCached);
@@ -1043,7 +1043,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
 
     fs::create_directory(path);
 
-    cachedPath[fNetSpecific]=true;
+    fCachedPath[fNetSpecific] = true;
     return path;
 }
 
@@ -1061,6 +1061,9 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
     if (!streamConfig.good())
         return; // No bitcoin.conf file is OK
 
+    // clear path cache after loading config file
+    fCachedPath[0] = fCachedPath[1] = false;
+
     set<string> setOptions;
     setOptions.insert("*");
 
