Fail if either disk space check fails

Rather than both. Introduced in 386a6b6
ElementsProject · Jan 9, 2019 · ba8c8b2 · ba8c8b2
1 parent 1973257
commit ba8c8b2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1631,8 +1631,14 @@ bool AppInitMain(InitInterfaces& interfaces)
 
  // ********************************************************* Step 11: import blocks
 
- if (!CheckDiskSpace() && !CheckDiskSpace(0, true))
+ if (!CheckDiskSpace(/* additional_bytes */ 0, /* blocks_dir */ false)) {
+ InitError(strprintf(_("Error: Disk space is low for %s"), GetDataDir()));
  return false;
+ }
+ if (!CheckDiskSpace(/* additional_bytes */ 0, /* blocks_dir */ true)) {
+ InitError(strprintf(_("Error: Disk space is low for %s"), GetBlocksDir()));
+ 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.