Changeset 6333 in josm for trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

Timestamp:

2013-10-27T03:20:19+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9189 - NPE when deleting data layer + additional usage of Main.isDisplayingMapView()

File:

• trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (1 diff)

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

@@ -261 +261 @@
             setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
         }  else if ("layer".equals(mode)) {
-            if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getAllLayersAsList().isEmpty()) {
+            if (!Main.isDisplayingMapView() || Main.map.mapView.getAllLayersAsList().isEmpty()) {
                 setEnabled(false);
             } else {