Merge pull request #1719 from DSheirer/1619-java-fx-windows-open-mini…

…mized #1619 JavaFX Windows Show Minimized
DSheirer · Nov 10, 2023 · ca61dd2 · ca61dd2
2 parents b51c807 + 6187253
commit ca61dd2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 28 deletions.
diff --git a/src/main/java/io/github/dsheirer/gui/JavaFxWindowManager.java b/src/main/java/io/github/dsheirer/gui/JavaFxWindowManager.java
@@ -164,27 +164,7 @@ private void createJFXPanel()
     public void shutdown()
     {
         MyEventBus.getGlobalEventBus().unregister(this);
-
-        if(mChannelMapStage != null)
-        {
-            mUserPreferences.getJavaFxPreferences().unmonitor(mChannelMapStage);
-        }
-
-        if(mIconManagerStage != null)
-        {
-            mUserPreferences.getJavaFxPreferences().unmonitor(mIconManagerStage);
-        }
-
-        if(mPlaylistStage != null)
-        {
-            mUserPreferences.getJavaFxPreferences().unmonitor(mPlaylistStage);
-        }
-
-        if(mUserPreferencesStage != null)
-        {
-            mUserPreferences.getJavaFxPreferences().unmonitor(mUserPreferencesStage);
-        }
-
+        mUserPreferences.getJavaFxPreferences().clearStageMonitors();
         Platform.exit();
     }
 

diff --git a/src/main/java/io/github/dsheirer/preference/javafx/JavaFxPreferences.java b/src/main/java/io/github/dsheirer/preference/javafx/JavaFxPreferences.java
@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,10 @@
 package io.github.dsheirer.preference.javafx;
 
 import io.github.dsheirer.preference.decoder.JmbeLibraryPreference;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.prefs.Preferences;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
@@ -28,11 +32,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.prefs.Preferences;
-
 /**
  * Manages user preferences for JavaFX elements (e.g. stages).
  */
@@ -59,7 +58,7 @@ public JavaFxPreferences()
      */
     public void monitor(Stage stage, String key)
     {
-        mStageMonitors.remove(new StageMonitor(stage, key));
+        mStageMonitors.add(new StageMonitor(stage, key));
     }
 
     /**
@@ -81,6 +80,21 @@ public void unmonitor(Stage stage)
         }
     }
 
+    /**
+     * Removes all stage monitors and prepares for shutdown.
+     */
+    public void clearStageMonitors()
+    {
+        Iterator<StageMonitor> it = mStageMonitors.iterator();
+
+        while(it.hasNext())
+        {
+            StageMonitor next = it.next();
+            it.remove();
+            next.dispose();
+        }
+    }
+
     /**
      * Monitors a stage's coordinates and stores location.  On construction, applies stored coordinates to the stage.
      */