aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bitcoind.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index f3844e9d47..ff61b9065b 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -176,9 +176,7 @@ bool AppInit(int argc, char* argv[])
if (!fRet)
{
Interrupt(threadGroup);
- // threadGroup.join_all(); was left out intentionally here, because we didn't re-test all of
- // the startup-failure cases to make sure they don't result in a hang due to some
- // thread-blocking-waiting-for-another-thread-during-startup case
+ threadGroup.join_all();
} else {
WaitForShutdown(&threadGroup);
}