Changeset 13694 in josm for trunk

Timestamp:

2018-05-01T16:26:12+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16133, see #16053 - fix imagery layer offset bug (regression of r13546)

File:

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

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

@@ -169 +169 @@
         case KeyEvent.VK_ESCAPE:
             if (offsetDialog != null) {
+                restoreOldMode = true;
                 offsetDialog.setVisible(false);
                 return;
@@ -365 +366 @@
                 return;
             if (oldMapMode != null) {
-                if (restoreOldMode) {
+                if (restoreOldMode || getValue() == ExtendedDialog.DialogClosedOtherwise) {
                     map.selectMapMode(oldMapMode);
                 }