Changeset 11078 in josm for trunk

Timestamp:

2016-10-04T14:43:51+02:00 (8 years ago)

Author:

michael2402

Message:

Fix #13744: If a layer removal triggers the removal of an other layer (e.g. Validator), do not remove it twice.

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java

@@ -47 +47 @@
             return;
         for (Layer l: selectedLayers) {
-            Main.getLayerManager().removeLayer(l);
+            if (model.getLayerManager().containsLayer(l)) {
+                // it may happen that this call removes other layers.
+                // this is why we need to check if every layer is still in the list of selected layers.
+                model.getLayerManager().removeLayer(l);
+            }
         }
     }