diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-19 18:10:52 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-19 18:11:15 +0200 |
| commit | c5875773561c249a079714f3b091a2577707eadf (patch) | |
| tree | 9aa1f86d86767beeea12bf1ab5b1136e9f6f60f1 /src/init.cpp | |
| parent | 475d68252e9c469393da92e4cd0e6caa428b4364 (diff) | |
| parent | 37aefff5fcf7169a1b07ff8939850f630640f7e7 (diff) | |
| download | bitcoin-c5875773561c249a079714f3b091a2577707eadf.tar.xz | |
Merge #8928: Fix init segfault where InitLoadWallet() calls ATMP before genesis
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
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 2b1fbed072..d3efc9f978 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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 |