diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-05-04 07:43:15 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-05-04 07:43:15 -0700 |
| commit | f309cb76c2c932317307d51961ca25cf051eb255 (patch) | |
| tree | 10a2cdd855b19475f138785f80e922939f91645a /src/qt | |
| parent | c9b1baaa293faeaa23d3ed33b6cc10e1ba0c3062 (diff) | |
| parent | d605bc4cd13716fde9c34d79a01f4ee128f8814f (diff) | |
| download | bitcoin-f309cb76c2c932317307d51961ca25cf051eb255.tar.xz | |
Merge pull request #2606 from gavinandresen/threadfix
Exit cleanly if AppInit2 returns false
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 1083f9bfe1..2d88700614 100644 --- 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) { |