Merge #9408: Allow shutdown during LoadMempool, dump only when necessary

325e400 [Qt] Do proper shutdown (Jonas Schnelli)
9479f8d Allow shutdown during LoadMempool, dump only when necessary (Jonas Schnelli)
This commit is contained in:
Pieter Wuille
2017-01-06 09:28:46 -08:00
3 changed files with 8 additions and 1 deletions

View File

@@ -4099,6 +4099,8 @@ bool LoadMempool(void)
} else {
++skipped;
}
if (ShutdownRequested())
return false;
}
std::map<uint256, CAmount> mapDeltas;
file >> mapDeltas;