Changeset 1979 in josm for trunk/src

Timestamp:

2009-08-13T20:39:03+02:00 (15 years ago)

Author:

stoecker

Message:

closes #3267 - patch by plaicy - fix NPE

File:

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

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

@@ -124 +124 @@
             }
         }
-        Set<Long> myPrimitiveIds = Main.map.mapView.getEditLayer().data.getCompletePrimitiveIds();
-        Set<Long> downloadedIds = getDownloadedIds();
-        myPrimitiveIds.removeAll(downloadedIds);
-        myPrimitiveIds.remove(new Long(0)); // ignore new primitives
-        if (! myPrimitiveIds.isEmpty()) {
-            handlePotentiallyDeletedPrimitives(myPrimitiveIds);
+        final OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+        if (editLayer != null) {
+            Set<Long> myPrimitiveIds = editLayer.data.getCompletePrimitiveIds();
+            Set<Long> downloadedIds = getDownloadedIds();
+            myPrimitiveIds.removeAll(downloadedIds);
+            myPrimitiveIds.remove(new Long(0)); // ignore new primitives
+            if (! myPrimitiveIds.isEmpty()) {
+                handlePotentiallyDeletedPrimitives(myPrimitiveIds);
+            }
         }
     }