Changeset 35767 in osm

Timestamp:

2021-05-24T20:23:08+02:00 (3 years ago)

Author:

holgermappt

Message:

Remove image data update listener only if it was registered, see #josm20893

File:

• applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java (modified) (3 diffs)

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java

@@ -67 +67 @@
      */
     private static class PropertyEditorAction extends JosmAction implements LayerChangeListener, ImageDataUpdateListener {
+        boolean imgDataUpdLstReg = false;
+
         public PropertyEditorAction() {
             super(tr("Edit photo GPS data"),  // String name
@@ -135 +137 @@
             if (layer instanceof GeoImageLayer) {
                 ((GeoImageLayer) layer).getImageData().addImageDataUpdateListener(this);
+                imgDataUpdLstReg = true;
             }
         }
@@ -143 +146 @@
 
             if (layer instanceof GeoImageLayer) {
-                ((GeoImageLayer) layer).getImageData().removeImageDataUpdateListener(this);
+                // In some combinations the listener might not be registered,
+                // e.g. if the plugin was added while the geo image layer
+                // existed and then the layer is removed.
+                if (imgDataUpdLstReg) {
+                    ((GeoImageLayer) layer).getImageData().removeImageDataUpdateListener(this);
+                    imgDataUpdLstReg = false;
+                }
             }
             this.updateEnabledState();