diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-02 04:28:35 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-02 04:29:01 +0200 |
| commit | 471d38b01534dd786d7d3dc7a62809755c3418ed (patch) | |
| tree | 49449b3489acb24e660eaf162493e94e574e8f3f /src/init.cpp | |
| parent | 35eaa6b4573e06ac8cc757d6fe7e2ef3ebb8473f (diff) | |
| parent | 20a11ffabf0c6936ab2dbb7cfda676996318650a (diff) | |
| download | bitcoin-471d38b01534dd786d7d3dc7a62809755c3418ed.tar.xz | |
Merge pull request #4980
20a11ff minor variable init changes in init.cpp (Philip Kaufmann)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index 503df7ad3f..980c589b29 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -45,7 +45,7 @@ using namespace boost; using namespace std; #ifdef ENABLE_WALLET -CWallet* pwalletMain; +CWallet* pwalletMain = NULL; #endif #ifdef WIN32 @@ -109,7 +109,7 @@ bool ShutdownRequested() return fRequestShutdown; } -static CCoinsViewDB *pcoinsdbview; +static CCoinsViewDB *pcoinsdbview = NULL; void Shutdown() { @@ -165,8 +165,8 @@ void Shutdown() #endif UnregisterAllWallets(); #ifdef ENABLE_WALLET - if (pwalletMain) - delete pwalletMain; + delete pwalletMain; + pwalletMain = NULL; #endif LogPrintf("%s: done\n", __func__); } @@ -701,6 +701,7 @@ bool AppInit2(boost::thread_group& threadGroup) fIsBareMultisigStd = GetArg("-permitbaremultisig", true) != 0; // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log + // Sanity check if (!InitSanityCheck()) return InitError(_("Initialization sanity check failed. Bitcoin Core is shutting down.")); |