Ticket #23648: 23648.patch

src/org/openstreetmap/josm/actions/SaveAction.java

@@ -91 +91 @@
     @Override
     protected void updateEnabledState() {
         Layer activeLayer = getLayerManager().getActiveLayer();
-        boolean en = activeLayer != null
-                && activeLayer.isSavable() && !(activeLayer.getAssociatedFile() != null
-                && activeLayer instanceof SaveToFile && !((SaveToFile) activeLayer).requiresSaveToFile());
-        GuiHelper.runInEDT(() -> setEnabled(en));
+                boolean en = activeLayer != null && activeLayer.isSavable();
+                GuiHelper.runInEDT(() -> setEnabled(en));
     }
 
     @Override

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1195 +1195 @@
         if (data.getUploadPolicy() != UploadPolicy.BLOCKED &&
                 (uploadDiscouraged ^ isUploadDiscouraged())) {
             data.setUploadPolicy(uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL);
+            setRequiresSaveToFile(true);
             for (LayerStateChangeListener l : layerStateChangeListeners) {
                 l.uploadDiscouragedChanged(this, uploadDiscouraged);
             }