fix memory leak, ImgDisplay.destroy() was only called when at least…

… one image was viewed

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18947 0c6e7542-c601-0410-84e7-c038aed88b3b

src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -116,6 +116,8 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
 
     private UpdateImageThread updateImageThreadInstance;
 
+    private boolean destroyed;
+
     private class UpdateImageThread extends Thread {
         private boolean restart;
 
@@ -619,13 +621,16 @@ public ImageDisplay(ImageProcessor imageProcessor) {
 
     @Override
     public void destroy() {
-        removeMouseListener(imgMouseListener);
-        removeMouseWheelListener(imgMouseListener);
-        removeMouseMotionListener(imgMouseListener);
-        Config.getPref().removePreferenceChangeListener(this);
-        if (imageProcessor instanceof ImageryFilterSettings) {
-            ((ImageryFilterSettings) imageProcessor).removeFilterChangeListener(this);
+        if (!destroyed) {
+            removeMouseListener(imgMouseListener);
+            removeMouseWheelListener(imgMouseListener);
+            removeMouseMotionListener(imgMouseListener);
+            Config.getPref().removePreferenceChangeListener(this);
+            if (imageProcessor instanceof ImageryFilterSettings) {
+                ((ImageryFilterSettings) imageProcessor).removeFilterChangeListener(this);
+            }
         }
+        destroyed = true;
     }
 
     /**

src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -410,6 +410,8 @@ public void destroy() {
         toggleAction.destroy();
         cancelLoadingImage();
         super.destroy();
+        // make sure that Image Display is destroyed here, it might not be a component
+        imgDisplay.destroy();
         // Ensure that this dialog is removed from memory
         destroyInstance();
     }