From 81603973614dedfc898a8a36f157caeb9f6d2540 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 27 Oct 2014 02:01:01 +0100
Subject: [PATCH] Shutdown correctly

---
 src/main/java/io/bitsquare/BitSquareUI.java       |  5 +++--
 src/main/java/io/bitsquare/gui/AWTSystemTray.java | 11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/bitsquare/BitSquareUI.java b/src/main/java/io/bitsquare/BitSquareUI.java
index b5ce097269..7280b14879 100644
--- a/src/main/java/io/bitsquare/BitSquareUI.java
+++ b/src/main/java/io/bitsquare/BitSquareUI.java
@@ -84,7 +84,7 @@ public class BitSquareUI extends Application {
         final Injector injector = Guice.createInjector(new BitSquareModule());
 
         // currently there is not SystemTray support for java fx (planned for version 3) so we use the old AWT
-        AWTSystemTray.createSystemTray(primaryStage, injector.getInstance(ActorSystem.class));
+        AWTSystemTray.createSystemTray(primaryStage, injector.getInstance(ActorSystem.class), this);
 
         walletFacade = injector.getInstance(WalletFacade.class);
         messageFacade = injector.getInstance(MessageFacade.class);
@@ -146,7 +146,8 @@ public class BitSquareUI extends Application {
 
         KeyCodeCombination keyCodeCombination = new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN);
         scene.setOnKeyReleased(keyEvent -> {
-            if (keyCodeCombination.match(keyEvent)) AWTSystemTray.setStageHidden();
+            if (keyCodeCombination.match(keyEvent))
+                AWTSystemTray.setStageHidden();
         });
     }
 
diff --git a/src/main/java/io/bitsquare/gui/AWTSystemTray.java b/src/main/java/io/bitsquare/gui/AWTSystemTray.java
index 86be13cb56..57f77324f7 100644
--- a/src/main/java/io/bitsquare/gui/AWTSystemTray.java
+++ b/src/main/java/io/bitsquare/gui/AWTSystemTray.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui;
 
 
 import io.bitsquare.BitSquare;
+import io.bitsquare.BitSquareUI;
 import io.bitsquare.gui.util.ImageUtil;
 
 import java.awt.*;
@@ -46,11 +47,13 @@ public class AWTSystemTray {
     private static MenuItem showGuiItem;
     private static Stage stage;
     private static ActorSystem actorSystem;
+    private static BitSquareUI application;
     private static TrayIcon trayIcon;
 
-    public static void createSystemTray(Stage stage, ActorSystem actorSystem) {
+    public static void createSystemTray(Stage stage, ActorSystem actorSystem, BitSquareUI application) {
         AWTSystemTray.stage = stage;
         AWTSystemTray.actorSystem = actorSystem;
+        AWTSystemTray.application = application;
 
         if (SystemTray.isSupported()) {
             // prevent exiting the app when the last window get closed
@@ -99,7 +102,11 @@ public class AWTSystemTray {
                     else
                         log.error(ex.getMessage());
                 }
-                System.exit(0);
+                try {
+                    application.stop();
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             });