Changeset 4456 in josm for trunk/src

Timestamp:

2011-09-24T11:58:58+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6873 - Layers merge compatibility check should be mutual (patch by Don-vip)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -710 +710 @@
                     Layer firstLayer = getModel().getSelectedLayers().get(0);
                     for (Layer l: getModel().getSelectedLayers()) {
-                        if (l != firstLayer && !l.isMergable(firstLayer)) {
+                        if (l != firstLayer && (!l.isMergable(firstLayer) || !firstLayer.isMergable(l))) {
                             setEnabled(false);
                             return;
@@ -1287 +1287 @@
                     continue;
                 }
-                if (target.isMergable(source)) {
+                if (target.isMergable(source) && source.isMergable(target)) {
                     targets.add(target);
                 }