Skip to content

Commit

Permalink
Merge bitcoin#11831: Always return true if AppInitMain got to the end
Browse files Browse the repository at this point in the history
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 bitcoin#11605).

Tree-SHA512: f0fea8c1b9265e2eeda57043d541380a3e58e4d9388fa24628a52fd56324257fcd7df0ca02e8f77f66fadd68d951893bab0f610ed9fd0a89b2ccd6bad1efa351
  • Loading branch information
laanwj authored and PastaPastaPasta committed Jun 25, 2019
1 parent a740a0c commit 60475f1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2158,5 +2158,5 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
pwalletMain->postInitProcess(scheduler);
#endif

return !fRequestShutdown;
return true;
}

0 comments on commit 60475f1

Please sign in to comment.