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

Timestamp:

2018-05-26T18:21:19+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16302 - IAE when switching map mode while offset dialog is open

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ImageryAdjustAction.java (modified) (1 diff)
• mapmode/MapMode.java (modified) (4 diffs)

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

@@ -371 +371 @@
                 return;
             if (oldMapMode != null) {
-                if (restoreOldMode || getValue() == ExtendedDialog.DialogClosedOtherwise) {
+                if (restoreOldMode || (!exitingMode && getValue() == ExtendedDialog.DialogClosedOtherwise)) {
                     map.selectMapMode(oldMapMode);
                 }

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
+
+import javax.swing.Action;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -21 +23 @@
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -69 +72 @@
      */
     public void enterMode() {
+        Logging.debug("Entering map mode: {0}", getValue(Action.NAME));
         putValue("active", Boolean.TRUE);
         Config.getPref().addPreferenceChangeListener(this);
@@ -80 +84 @@
      */
     public void exitMode() {
+        Logging.debug("Exiting map mode: {0}", getValue(Action.NAME));
         putValue("active", Boolean.FALSE);
         Config.getPref().removePreferenceChangeListener(this);