Merge pull request #2606 from gavinandresen/threadfix

Exit cleanly if AppInit2 returns false
2013-05-04 07:43:15 -07:00
parent c9b1baaa29 d605bc4cd1
commit f309cb76c2
2 changed files with 6 additions and 3 deletions
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -282,6 +282,9 @@ int main(int argc, char *argv[])
        }
        else
        {
+            threadGroup.interrupt_all();
+            threadGroup.join_all();
+            Shutdown();
            return 1;
        }
    } catch (std::exception& e) {