Changeset 2343 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.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/downloadtasks/DownloadGpsTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -87 +87 @@
         private Layer findMergeLayer() {
             boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false);
-            if (Main.map == null)
+            if (!Main.isDisplayingMapView())    
                 return null;
             Layer active = Main.map.mapView.getActiveLayer();