Changeset 18941 in josm for trunk/src/org

Timestamp:

2024-01-19T09:06:03+01:00 (10 months ago)

Author:

GerdP

Message:

fix #23408

• fix crash when lots of GeoImageLayer layers are closed without and no data layer is open
• don't show save layers dialog when no save or upload action is available.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/SaveLayersDialog.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -123 +123 @@
                 AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
                 if (odl.isModified() &&
-                        ((!odl.isSavable() && !odl.isUploadable()) ||
+                        (odl.isSavable() || odl.isUploadable() ||
                                 odl.requiresSaveToFile() ||
                                 odl.requiresUploadToServer())) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -744 +744 @@
         mapModeListener = (oldMapMode, newMapMode) -> {
             MapView mapView = MainApplication.getMap().mapView;
+            mapView.removeMouseListener(mouseAdapter);
+            mapView.removeMouseMotionListener(mouseMotionAdapter);
             if (newMapMode == null || isSupportedMapMode(newMapMode)) {
                 mapView.addMouseListener(mouseAdapter);
                 mapView.addMouseMotionListener(mouseMotionAdapter);
-            } else {
-                mapView.removeMouseListener(mouseAdapter);
-                mapView.removeMouseMotionListener(mouseMotionAdapter);
             }
         };