Changeset 11123 in josm for trunk/src


Ignore:
Timestamp:
2016-10-12T20:08:07+02:00 (3 years ago)
Author:
simon04
Message:

fix #13779 - EDT violation detected

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

    r10601 r11123  
    4747                        if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer
    4848                                && ((OsmDataLayer) sourceLayer).isUploadDiscouraged() != ((OsmDataLayer) targetLayer).isUploadDiscouraged()) {
    49                             if (warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)) {
     49                            if (Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
     50                                    warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)))) {
    5051                                break;
    5152                            }
Note: See TracChangeset for help on using the changeset viewer.