Changeset 17552 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2021-03-05T22:50:02+01:00 (4 years ago)

Author:

wiktorn

Message:

Do not allow adding WMS imagery when no layer is selected

When no layer is selected (or the layer that is selected has no name, only
title) - do not treat this selection as valid and prevent adding such imagery
(as the Layer= parameter will be empty then and layer will not work).

Closes: #20565

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -207 +207 @@
             return false;
         }
-        if (setDefaultLayers.isSelected() && (tree == null || tree.getSelectedLayers().isEmpty())) {
+        /*
+         * We need selection of the layers in following situations:
+         * * endpoint is not selected (and we don't care about setDefault layers as it's disabled anyway)
+         * * endpoint is selected and setDefultLayers is selected
+         */
+        if ((!endpoint.isSelected() || setDefaultLayers.isSelected()) && (tree == null || tree.getSelectedLayers().isEmpty())) {
             return false;
         }