From 37aefff5fcf7169a1b07ff8939850f630640f7e7 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 13:19:16 -0400
Subject: Fix init segfault where InitLoadWallet() calls ATMP before genesis

---
 src/init.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/init.cpp')

diff --git a/src/init.cpp b/src/init.cpp
index eefef7ba0..057d8eefe 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
-- 
cgit v1.2.3