Changeset 5869 in josm for trunk

Timestamp:

2013-04-15T19:51:56+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8609 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -361 +361 @@
      *
      * @param from  the source data set
+     * @param progressMonitor the progress monitor, can be {@code null}
      */
     public void mergeFrom(final DataSet from, ProgressMonitor progressMonitor) {
@@ -407 +408 @@
             Main.map.mapView.repaint();
         }
-        Main.map.conflictDialog.warnNumNewConflicts(numNewConflicts);
+        // warn about new conflicts
+        if (numNewConflicts > 0 && Main.map != null && Main.map.conflictDialog != null) {
+            Main.map.conflictDialog.warnNumNewConflicts(numNewConflicts);
+        }
     }