Merge pull request #5243

ff09e31 sleep-wait on genesis block during init with -reindex (Matt Corallo)
2015-01-26 12:29:06 +01:00 · 2015-01-26 12:29:06 +01:00 · 2fae1875ea
commit 2fae1875ea
parent 8204e19abe ff09e31a51
1 changed files with 5 additions and 0 deletions
--- 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