Changeset 5758 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-03-06T22:23:19+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #6630 - NPE when merging data

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

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

@@ -407 +407 @@
         }
         // repaint to make sure new data is displayed properly.
-        Main.map.mapView.repaint();
+        if (Main.map != null && Main.map.mapView != null) {
+            Main.map.mapView.repaint();
+        }
         warnNumNewConflicts(numNewConflicts);
     }