Changeset 10930 in josm

Timestamp:

2016-09-02T14:22:48+02:00 (8 years ago)

Author:

michael2402

Message:

Fix #13512: Do not attempt to restore old map mode when imagery dialog change was caused by map mode change.

File:

• trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -92 +92 @@
             }
             offsetDialog.setVisible(false);
+            // do not restore old mode here - this is called when the new mode is already known.
             offsetDialog = null;
         }
@@ -301 +302 @@
             }
             Main.main.menu.imageryMenu.refreshOffsetMenu();
+        }
+
+        private void restoreMapModeState() {
             if (Main.map == null)
                 return;
-            if (oldMapMode != null) {
+            if (oldMapMode != null ) {
                 Main.map.selectMapMode(oldMapMode);
                 oldMapMode = null;
@@ -315 +319 @@
             public void windowClosing(WindowEvent e) {
                 setVisible(false);
+                restoreMapModeState();
             }
         }