Changeset 13546 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2018-03-19T20:57:48+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16053, see #15849 - make ImageryAdjustAction robust to change of map mode via shortcut

File:

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

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

@@ -53 +53 @@
     private MapMode oldMapMode;
     private boolean exitingMode;
+    private boolean restoreOldMode;
 
     /**
@@ -113 +114 @@
     @Override
     public void exitMode() {
+        // do not restore old mode here - this is called when the new mode is already known.
+        restoreOldMode = false;
+        doExitMode();
+    }
+
+    private void exitModeAndRestoreOldMode() {
+        restoreOldMode = true;
+        doExitMode();
+        restoreOldMode = false;
+    }
+
+    private void doExitMode() {
         exitingMode = true;
         super.exitMode();
@@ -120 +133 @@
             }
             hideOffsetDialog();
-            // do not restore old mode here - this is called when the new mode is already known.
         }
         removeListeners();
@@ -352 +364 @@
                 return;
             if (oldMapMode != null) {
-                map.selectMapMode(oldMapMode);
+                if (restoreOldMode) {
+                    map.selectMapMode(oldMapMode);
+                }
                 oldMapMode = null;
             } else if (!exitingMode && !map.selectSelectTool(false)) {
-                exitMode();
+                exitModeAndRestoreOldMode();
                 map.mapMode = null;
             }