Merge bitcoin#8928: Fix init segfault where InitLoadWallet() calls AT…

…MP before genesis 37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
absolute-community · Oct 19, 2016 · c587577 · c587577
2 parents 475d682 + 37aefff
commit c587577
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -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;