diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/rpcwallet.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 1f6826413a..e75e981a57 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -100,6 +100,7 @@ static CCoinsViewDB *pcoinsdbview; void Shutdown() { + LogPrintf("Shutdown : In progress...\n"); static CCriticalSection cs_Shutdown; TRY_LOCK(cs_Shutdown, lockShutdown); if (!lockShutdown) return; @@ -130,6 +131,7 @@ void Shutdown() UnregisterAllWallets(); if (pwalletMain) delete pwalletMain; + LogPrintf("Shutdown : done\n"); } // diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 4bf3580320..cafb6db9b1 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1479,13 +1479,13 @@ Value validateaddress(const Array& params, bool fHelp) CTxDestination dest = address.Get(); string currentAddress = address.ToString(); ret.push_back(Pair("address", currentAddress)); - bool fMine = IsMine(*pwalletMain, dest); + bool fMine = pwalletMain ? IsMine(*pwalletMain, dest) : false; ret.push_back(Pair("ismine", fMine)); if (fMine) { Object detail = boost::apply_visitor(DescribeAddressVisitor(), dest); ret.insert(ret.end(), detail.begin(), detail.end()); } - if (pwalletMain->mapAddressBook.count(dest)) + if (pwalletMain && pwalletMain->mapAddressBook.count(dest)) ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name)); } return ret; |