Merge pull request #4980
20a11ff
minor variable init changes in init.cpp (Philip Kaufmann)
This commit is contained in:
commit
471d38b015
1 changed files with 5 additions and 4 deletions
|
@ -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."));
|
||||
|
|
Loading…
Reference in a new issue