diff options
| author | Matt Corallo <git@bluematt.me> | 2016-10-15 13:19:16 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2016-10-15 13:19:16 -0400 |
| commit | 37aefff5fcf7169a1b07ff8939850f630640f7e7 (patch) | |
| tree | d5aae4fc2f7709e607b545b1039fd57483fea7db /src/init.cpp | |
| parent | 49c5910372899a365fd6b57b9e227518e24541fa (diff) | |
| download | bitcoin-37aefff5fcf7169a1b07ff8939850f630640f7e7.tar.xz | |
Fix init segfault where InitLoadWallet() calls ATMP before genesis
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index eefef7ba0b..057d8eefee 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1488,6 +1488,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 |