diff options
| author | Philip Kaufmann <[email protected]> | 2012-06-11 07:40:14 +0200 |
|---|---|---|
| committer | Philip Kaufmann <[email protected]> | 2012-06-12 07:21:03 +0200 |
| commit | 9247134eaba9a1d0fa74f22de238af1476663005 (patch) | |
| tree | 50a54aae174152f5a27f48c923d2124937331f43 /src/qt/bitcoin.cpp | |
| parent | Merge pull request #1435 from TheBlueMatt/mingwbuild (diff) | |
| download | discoin-9247134eaba9a1d0fa74f22de238af1476663005.tar.xz discoin-9247134eaba9a1d0fa74f22de238af1476663005.zip | |
introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 2a2d20039..8c8c73f06 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -290,6 +290,7 @@ int main(int argc, char *argv[]) window.setWalletModel(0); guiref = 0; } + // Shutdown the core and it's threads, but don't exit Bitcoin-Qt here Shutdown(NULL); } else |