Browse Source

SQUASHME: fix "Reserve only one network specific cached path per session"

0.10
jtimon 10 years ago
parent
commit
ebdb9ff639
  1. 8
      src/util.cpp

8
src/util.cpp

@ -395,7 +395,8 @@ boost::filesystem::path GetDefaultDataDir() @@ -395,7 +395,8 @@ boost::filesystem::path GetDefaultDataDir()
#endif
}
static boost::filesystem::path pathCached[2];
static boost::filesystem::path pathCached;
static boost::filesystem::path pathCachedNetSpecific;
static CCriticalSection csPathCached;
const boost::filesystem::path &GetDataDir(bool fNetSpecific)
@ -404,7 +405,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) @@ -404,7 +405,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
LOCK(csPathCached);
fs::path &path = pathCached[fNetSpecific ? 1 : 0];
fs::path &path = fNetSpecific ? pathCachedNetSpecific : pathCached;
// This can be called during exceptions by LogPrintf(), so we cache the
// value so we don't have to do memory allocations after that.
@ -430,7 +431,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) @@ -430,7 +431,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
void ClearDatadirCache()
{
std::fill(&pathCached[0], &pathCached[2], boost::filesystem::path());
pathCached = boost::filesystem::path();
pathCachedNetSpecific = boost::filesystem::path();
}
boost::filesystem::path GetConfigFile()

Loading…
Cancel
Save