Changeset 11063 in josm for trunk/src/org

Timestamp:

2016-09-27T21:08:25+02:00 (8 years ago)

Author:

simon04

Message:

fix #13561 - Cannot go out of "Adjust imagery offset" even after pressing Ok or Cancel and dialog disappeared

File:

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

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

@@ -286 +286 @@
             }
             super.buttonAction(buttonIndex, evt);
+            restoreMapModeState();
         }
 
@@ -311 +312 @@
             }
 
-            private void restoreMapModeState() {
-                if (Main.map == null)
-                    return;
-                if (oldMapMode != null) {
-                    Main.map.selectMapMode(oldMapMode);
-                    oldMapMode = null;
-                } else {
-                    Main.map.selectSelectTool(false);
-                }
-            }
+        }
+    }
+
+    private void restoreMapModeState() {
+        if (Main.map == null)
+            return;
+        if (oldMapMode != null) {
+            Main.map.selectMapMode(oldMapMode);
+            oldMapMode = null;
+        } else {
+            Main.map.selectSelectTool(false);
         }
     }