Do diskspace check before import thread is started

sipa · luke-jr · commit fc349288cbcf · 2016-09-21T02:43:47.000Z
Github-Pull: #8392
Rebased-From: 9d4eb9ad99f7c3abf7abaeaf7ea51f98f9445e75
diff --git a/src/init.cpp b/src/init.cpp
@@ -1418,6 +1418,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 10: import blocks
 
+    if (!CheckDiskSpace())
+        return false;
+
     // Either install a handler to notify us when genesis activates, or set fHaveGenesis directly.
     // No locking, as this happens before any background thread is started.
     if (chainActive.Tip() == NULL) {
@@ -1449,9 +1452,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 11: start node
 
-    if (!CheckDiskSpace())
-        return false;
-
     if (!strErrors.str().empty())
         return InitError(strErrors.str());
 
