diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-06 09:28:46 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-06 09:37:43 -0800 |
| commit | 46b249e578e8a3dfbe85bc7253a12e82ef4b658b (patch) | |
| tree | 282787752e6f7ddd76587ebc060f5e52cab3d3a4 /src/validation.cpp | |
| parent | a55716abe5662ec74c2f8af93023f1e7cca901fc (diff) | |
| parent | 325e400f9ba89c6f5501c6cedd4dee979a3912b2 (diff) | |
| download | bitcoin-46b249e578e8a3dfbe85bc7253a12e82ef4b658b.tar.xz | |
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)
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 2 |
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; |