Changeset 13419 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-02-12T22:32:19+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #14802 - make sure audio resources are cleared when marker layer is destroyed

Location:

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer

Files:

• AudioMarker.java (modified) (1 diff)
• MarkerLayer.java (modified) (1 diff)

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

@@ -41 +41 @@
     }
 
+    /**
+     * Returns the marker played the most recently, if any.
+     * @return the marker played the most recently, or {@code null}
+     */
     public static AudioMarker recentlyPlayedMarker() {
         return recentlyPlayedMarker;
+    }
+
+    /**
+     * Forgets the marker played the most recently, if any.
+     */
+    static void resetRecentlyPlayedMarker() {
+        recentlyPlayedMarker = null;
     }
 

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

@@ -144 +144 @@
 
     @Override
+    public synchronized void destroy() {
+        if (data.contains(AudioMarker.recentlyPlayedMarker())) {
+            AudioMarker.resetRecentlyPlayedMarker();
+        }
+        syncAudioMarker = null;
+        currentMarker = null;
+        fromLayer = null;
+        data.clear();
+        super.destroy();
+    }
+
+    @Override
     public LayerPainter attachToMapView(MapViewEvent event) {
         event.getMapView().addMouseListener(new MarkerMouseAdapter());