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

Timestamp:

2022-03-28T16:06:12+02:00 (2 years ago)

Author:

taylor.smock

Message:

fix #21521: IOOBE in ImageData.getSelectedImage

This is caused by not updating the selected image when an image is
removed from the image dataset. This only occurs when the remove
method is called in ImageEntry.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/ImageData.java (modified) (1 diff)
• gui/layer/geoimage/ImageEntry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/ImageData.java

@@ -380 +380 @@
         if (fireUpdateEvent) {
             notifyImageUpdate();
+            // Fix JOSM #21521 -- when an image is removed, we need to update the selected image
+            this.updateSelectedImage();
         }
     }

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

@@ -172 +172 @@
     @Override
     public boolean remove() {
-        this.dataSet.removeImage(this, false);
+        this.dataSet.removeImage(this, true);
         return true;
     }