Changeset 2343 in josm for trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java

Timestamp:

2009-10-28T20:14:07+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3792: NPE when deleting the data layer while the deletion tool is active

File:

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

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

@@ -20 +20 @@
 
     public void actionPerformed(ActionEvent e) {
-        if (Main.map == null) return;
+        if (!Main.isDisplayingMapView()) return;
         Main.map.mapView.zoomToFactor(0.9);
     }
@@ -27 +27 @@
     protected void updateEnabledState() {
         setEnabled(
-                Main.map != null
-                && Main.map.mapView != null
+                Main.isDisplayingMapView()
                 && Main.map.mapView.hasLayers()
         );