From: fsb4000 Date: Sat, 3 Jan 2015 23:13:35 +0000 (+0600) Subject: более правильное решение issue96 и issue95 X-Git-Tag: nvc-v0.5.1~24^2~2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=1cf39cb4b2492cb7e3e26ec242de09e7a6d9bc50 более правильное решение issue96 и issue95 --- diff --git a/src/init.cpp b/src/init.cpp index e40f36b..cc66c3d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -28,7 +28,7 @@ using namespace boost; CWallet* pwalletMain; CClientUIInterface uiInterface; -std::string strWalletFileName = "wallet.dat"; +std::string strWalletFileName; bool fConfChange; unsigned int nNodeLifespan; unsigned int nDerivationMethodIndex; @@ -499,7 +499,7 @@ bool AppInit2() // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log std::string strDataDir = GetDataDir().string(); - std::string strWalletFileName = GetArg("-wallet", "wallet.dat"); + strWalletFileName = GetArg("-wallet", "wallet.dat"); // strWalletFileName must be a plain filename without a directory if (strWalletFileName != boost::filesystem::basename(strWalletFileName) + boost::filesystem::extension(strWalletFileName))