Ticket #19876: 19876.3.patch

src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.SwingUtilities;
+
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
@@ -104 +106 @@
     @Override
     public void run() {
         final PreferenceDialog p = new PreferenceDialog(MainApplication.getMainFrame());
-        if (tab != null) {
-            p.selectPreferencesTabByClass(tab);
-        } else if (subTab != null) {
-            p.selectSubPreferencesTabByClass(subTab);
-        } else {
-            p.selectPreviouslySelectedPreferences();
-        }
+        SwingUtilities.invokeLater(() -> {
+            if (tab != null) {
+                p.selectPreferencesTabByClass(tab);
+            } else if (subTab != null) {
+                p.selectSubPreferencesTabByClass(subTab);
+            } else {
+                p.selectPreviouslySelectedPreferences();
+            }
+        });
         p.setVisible(true);
     }
 }

src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -229 +229 @@
     public void dispose() {
         previouslySelected = tpPreferences.getSelectedTab();
         removeWindowListener(windowEventHandler);
+        setVisible(false); // save current geometry
         super.dispose();
     }
 }