Changeset 6964 in josm for trunk/src

Timestamp:

2014-04-09T22:48:16+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9905 - fix EDT violation in merge layer action

File:

• trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -45 +45 @@
             public void run() {
                 boolean layerMerged = false;
-                for (Layer sourceLayer: sourceLayers) {
+                for (final Layer sourceLayer: sourceLayers) {
                     if (sourceLayer != null && sourceLayer != targetLayer) {
                         if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer
@@ -54 +54 @@
                         }
                         targetLayer.mergeFrom(sourceLayer);
-                        Main.main.removeLayer(sourceLayer);
+                        GuiHelper.runInEDTAndWait(new Runnable() {
+                            @Override
+                            public void run() {
+                                Main.main.removeLayer(sourceLayer);
+                            }
+                        });
                         layerMerged = true;
                     }