Changeset 5907 in josm

Timestamp:

2013-04-28T23:59:22+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8642 - Fix NPE when deleting osm data layer with active validator layer

File:

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

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

@@ -156 +156 @@
     @Override
     public void layerRemoved(Layer oldLayer) {
-        if (oldLayer instanceof OsmDataLayer &&  Main.map.mapView.getEditLayer() == null) {
+        if (oldLayer instanceof OsmDataLayer && Main.map != null && Main.map.mapView.getEditLayer() == null) {
             Main.main.removeLayer(this);
         } else if (oldLayer == this) {