aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.cpp12
-rw-r--r--serialize.h4
-rw-r--r--util.cpp3
-rw-r--r--util.h1
4 files changed, 6 insertions, 14 deletions
diff --git a/init.cpp b/init.cpp
index 77c1225d75..e7382d77fa 100644
--- a/init.cpp
+++ b/init.cpp
@@ -4,8 +4,6 @@
#include "headers.h"
-extern string GetDefaultDataDir(); /// todo: delete this later, just used by debug test
-
@@ -430,15 +428,7 @@ bool CMyApp::OnInit2()
printf("Bitcoin version %d.%d.%d%s beta, OS version %s\n", VERSION/10000, (VERSION/100)%100, VERSION%100, pszSubVer, ((string)wxGetOsDescription()).c_str());
printf("System default language is %d %s\n", m_locale.GetSystemLanguage(), ((string)m_locale.GetSysName()).c_str());
printf("Language file %s (%s)\n", (string("locale/") + (string)m_locale.GetCanonicalName() + "/LC_MESSAGES/bitcoin.mo").c_str(), ((string)m_locale.GetLocale()).c_str());
-
- /// debug - for now, just watching if these match
- if (pszSetDataDir[0] == 0)
- {
- if (GetDefaultDataDir() != GetDataDir())
- printf("**** GetDefaultDataDir() %s != %s\n", GetDefaultDataDir().c_str(), GetDataDir().c_str());
- else
- printf("OK GetDefaultDataDir() %s == %s\n", GetDefaultDataDir().c_str(), GetDataDir().c_str());
- }
+ printf("Default data directory %s\n", GetDefaultDataDir().c_str());
if (mapArgs.count("-loadblockindextest"))
{
diff --git a/serialize.h b/serialize.h
index 25a6532f71..a32d106a32 100644
--- a/serialize.h
+++ b/serialize.h
@@ -19,8 +19,8 @@ class CScript;
class CDataStream;
class CAutoFile;
-static const int VERSION = 300;
-static const char* pszSubVer = ".2";
+static const int VERSION = 301;
+static const char* pszSubVer = ".0";
diff --git a/util.cpp b/util.cpp
index 250861f5e4..4293b2d5e2 100644
--- a/util.cpp
+++ b/util.cpp
@@ -604,7 +604,8 @@ void GetDataDir(char* pszDir)
static char pszCachedDir[MAX_PATH];
if (pszCachedDir[0] == 0)
{
- strlcpy(pszCachedDir, wxStandardPaths::Get().GetUserDataDir().c_str(), sizeof(pszCachedDir));
+ //strlcpy(pszCachedDir, wxStandardPaths::Get().GetUserDataDir().c_str(), sizeof(pszCachedDir));
+ strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir));
_mkdir(pszCachedDir);
}
strlcpy(pszDir, pszCachedDir, MAX_PATH);
diff --git a/util.h b/util.h
index e92204f22d..030a1d77a7 100644
--- a/util.h
+++ b/util.h
@@ -144,6 +144,7 @@ void GetDataDir(char* pszDirRet);
#ifdef __WXMSW__
string MyGetSpecialFolderPath(int nFolder, bool fCreate);
#endif
+string GetDefaultDataDir();
string GetDataDir();
void ShrinkDebugFile();
uint64 GetRand(uint64 nMax);