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)

1 files changed, 2 insertions, 0 deletions

diff --git a/src/validation.cpp b/src/validation.cpp
index 648fed8bc6..37a4186e0a 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4099,6 +4099,8 @@ bool LoadMempool(void)
             } else {
                 ++skipped;
             }
+            if (ShutdownRequested())
+                return false;
         }
         std::map<uint256, CAmount> mapDeltas;
         file >> mapDeltas;