mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
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
This commit is contained in:
parent
07316dda2c
commit
3855979343
@ -2294,12 +2294,5 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
StartWallets(scheduler);
|
||||
#endif
|
||||
|
||||
// Final check if the user requested to kill the GUI during one of the last operations. If so, exit.
|
||||
if (fRequestShutdown)
|
||||
{
|
||||
LogPrintf("Shutdown requested. Exiting.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user