aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-12-12 10:27:45 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-12-12 10:27:53 +0100
commitd48ab83f00538a5135b2c448809260a9d46ca31c (patch)
tree8ea793e11872823c1a8089f5af49a677603389b8
parentc0902624b0ec6f5fff29eb6e922c58816f395dc8 (diff)
parent07c483895d219d4c44bd8fec5167a53f4701c364 (diff)
Merge #11831: Always return true if AppInitMain got to the end
07c4838 Always return true if AppInitMain got to the end (Matt Corallo) Pull request description: This should fix a rare zapwallettxes failure on travis, but also avoids having init operations (re-adding wallet transactions to mempool) running after RPC is free'd. I believe this was the failure at https://travis-ci.org/bitcoin/bitcoin/jobs/311747844 (from #11605). Tree-SHA512: f0fea8c1b9265e2eeda57043d541380a3e58e4d9388fa24628a52fd56324257fcd7df0ca02e8f77f66fadd68d951893bab0f610ed9fd0a89b2ccd6bad1efa351
-rw-r--r--src/init.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 67e01c9ba9..e4cad01b70 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1726,5 +1726,5 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
StartWallets(scheduler);
#endif
- return !fRequestShutdown;
+ return true;
}