Merge pull request #5243

ff09e31 sleep-wait on genesis block during init with -reindex (Matt Corallo)
TrezarCoin · Jan 26, 2015 · 2fae187 · 2fae187
2 parents 8204e19 + ff09e31
commit 2fae187
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1254,6 +1254,11 @@ bool AppInit2(boost::thread_group& threadGroup)
             vImportFiles.push_back(strFile);
     }
     threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles));
+    if (chainActive.Tip() == NULL) {
+        LogPrintf("Waiting for genesis block to be imported...\n");
+        while (!fRequestShutdown && chainActive.Tip() == NULL)
+            MilliSleep(10);
+    }
 
     // ********************************************************* Step 10: start node