Changeset 11123 in josm for trunk

Timestamp:

2016-10-12T20:08:07+02:00 (8 years ago)

Author:

simon04

Message:

fix #13779 - EDT violation detected

File:

• trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (1 diff)

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

@@ -47 +47 @@
                         if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer
                                 && ((OsmDataLayer) sourceLayer).isUploadDiscouraged() != ((OsmDataLayer) targetLayer).isUploadDiscouraged()) {
-                            if (warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)) {
+                            if (Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
+                                    warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)))) {
                                 break;
                             }