Changeset 13433 in josm for trunk

Timestamp:

2018-02-17T18:15:47+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15849, see #15716 - IAE when changing active layer while setting offset

File:

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

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

@@ -52 +52 @@
     private transient AbstractTileSourceLayer<?> layer;
     private MapMode oldMapMode;
+    private boolean exitingMode;
 
     /**
@@ -112 +113 @@
     @Override
     public void exitMode() {
+        exitingMode = true;
         super.exitMode();
         if (offsetDialog != null) {
@@ -121 +123 @@
         }
         removeListeners();
+        exitingMode = false;
     }
 
@@ -351 +354 @@
                 map.selectMapMode(oldMapMode);
                 oldMapMode = null;
-            } else if (!map.selectSelectTool(false)) {
+            } else if (!exitingMode && !map.selectSelectTool(false)) {
                 exitMode();
                 map.mapMode = null;