Don't call exit() in Shutdown() for Bitcoin-Qt (fixes a tray-icon issue)

(partial of 9247134eaba9a1d0fa74f22de238af1476663005)

diff --git a/src/init.cpp b/src/init.cpp
index 5f1e4f5..6b6a743 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -66,7 +66,10 @@ void Shutdown(void* parg)
         Sleep(50);
         printf("Bitcoin exiting\n\n");
         fExit = true;
+#ifndef QT_GUI
+        // ensure non UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp
         exit(0);
+#endif
     }
     else
     {

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 3157ead..8dde8f3 100644 (file)
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -208,6 +208,7 @@ int main(int argc, char *argv[])
                 window.hide();
                 guiref = 0;
             }
+            // Shutdown the core and it's threads, but don't exit Bitcoin-Qt here
             Shutdown(NULL);
         }
         else