Changeset 11123 in josm
- Timestamp:
- 2016-10-12T20:08:07+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java
r10601 r11123 47 47 if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer 48 48 && ((OsmDataLayer) sourceLayer).isUploadDiscouraged() != ((OsmDataLayer) targetLayer).isUploadDiscouraged()) { 49 if (warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)) { 49 if (Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() -> 50 warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)))) { 50 51 break; 51 52 }
Note:
See TracChangeset
for help on using the changeset viewer.