Changeset 18005 in josm for trunk/src/org

Timestamp:

2021-07-12T12:42:05+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21103 - see #14605 - proper fix of IllegalStateException in AutoScaleAction

File:

• trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (3 diffs)

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

@@ -39 +39 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -289 +288 @@
             return null;
         }
-        try {
-            List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
-            if (!layers.isEmpty())
-                return layers.get(0);
-        } catch (IllegalStateException e) {
-            Logging.error(e);
-        }
-        return null;
+        List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
+        return layers.isEmpty() ? null : layers.get(0);
     }
 
@@ -403 +396 @@
             break;
         case LAYER:
-            setEnabled(getFirstSelectedLayer() != null);
+            setEnabled(map != null && getFirstSelectedLayer() != null);
             break;
         case CONFLICT: