Merge pull request #1142 from Marketcetera/MATP-1106

MATP-1106 Photon Shutdown Hang
Marketcetera · Apr 3, 2023 · 6b3bdb9 · 6b3bdb9
2 parents 3bd586e + f24276a
commit 6b3bdb9
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 350 deletions.
diff --git a/photon/src/main/java/org/marketcetera/ui/DragResizer.java b/photon/src/main/java/org/marketcetera/ui/DragResizer.java
diff --git a/photon/src/main/java/org/marketcetera/ui/Draggable.java b/photon/src/main/java/org/marketcetera/ui/Draggable.java
diff --git a/photon/src/main/java/org/marketcetera/ui/LoginView.java b/photon/src/main/java/org/marketcetera/ui/LoginView.java
@@ -16,7 +16,6 @@
 import org.springframework.stereotype.Component;
 
 import io.grpc.StatusRuntimeException;
-import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.event.ActionEvent;
 import javafx.geometry.Insets;
@@ -171,8 +170,7 @@ private void onLogin(ActionEvent inEvent)
      */
     private void onCloseRequest(WindowEvent inEvent)
     {
-        // shutdown the whole app
-        Platform.exit();
+        PhotonApp.getApp().doAppShutdown();
     }
     /**
      * main scene of the dialog