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

Timestamp:

2009-10-28T20:14:07+01:00 (15 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/GpxExportAction.java (modified) (2 diffs)

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

@@ -33 +33 @@
 
     protected GpxLayer getLayer() {
-        if (Main.map == null) return null;
-        if (Main.map.mapView == null) return null;
+        if (!Main.isDisplayingMapView()) return null;
         if (Main.map.mapView.getActiveLayer() == null) return null;
         Layer layer = Main.map.mapView.getActiveLayer();
@@ -95 +94 @@
     @Override
     protected void updateEnabledState() {
-        boolean check = Main.main != null
-        && Main.map != null
-        && Main.map.mapView !=null
+        boolean check =            
+        Main.isDisplayingMapView() 
         && Main.map.mapView.getActiveLayer() != null;
         if(!check) {