Changeset 18948 in josm

Timestamp:

2024-01-21T08:34:04+01:00 (10 months ago)

Author:

GerdP

Message:

fix #23423 Memory leak: Markerlayer doesn't remove MouseListener

• add removeMouseListener() call in destroy()

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -101 +101 @@
 
     private final ListenerList<IGeoImageLayer.ImageChangeListener> imageChangeListenerListenerList = ListenerList.create();
+    private MarkerMouseAdapter mouseAdapter;
+    private MapView mapView;
 
     /**
@@ -193 +195 @@
         data.forEach(Marker::destroy);
         data.clear();
+        if (mouseAdapter != null && mapView != null)
+            mapView.removeMouseListener(mouseAdapter);
         super.destroy();
     }
@@ -198 +202 @@
     @Override
     public LayerPainter attachToMapView(MapViewEvent event) {
-        event.getMapView().addMouseListener(new MarkerMouseAdapter());
+        if (mapView != null) {
+            Logging.warn("MarkerLayer was already attached to a MapView");
+        }
+        mapView = event.getMapView();
+        mouseAdapter = new MarkerMouseAdapter();
+        mapView.addMouseListener(mouseAdapter);
 
         if (event.getMapView().playHeadMarker == null) {