maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge #8928: Fix init segfault where InitLoadWallet() calls ATMP before genesis

Browse source 
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan 2016-10-19 18:10:52 +02:00
parent 475d68252e 37aefff5fc
commit c587577356
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/init.cpp
View file

@ -1493,6 +1493,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait);
}
#ifdef ENABLE_WALLET
// Add wallet transactions that aren't already in a block to mempool
// Do this here as mempool requires genesis block to be loaded
if (pwalletMain)
pwalletMain->ReacceptWalletTransactions();
#endif
// ********************************************************* Step 11: start node
//// debug print

2
src/wallet/wallet.cpp
View file

@ -3466,8 +3466,6 @@ bool CWallet::InitLoadWallet()
LogPrintf("mapWallet.size() = %u\n", walletInstance->mapWallet.size());
LogPrintf("mapAddressBook.size() = %u\n", walletInstance->mapAddressBook.size());
}
// Add wallet transactions that aren't already in a block to mapTransactions
walletInstance->ReacceptWalletTransactions();
pwalletMain = walletInstance;