Changeset 18196 in josm for trunk/src

Timestamp:

2021-09-08T00:41:58+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21144 - make sure GPX combobox is updated when the GPX layer is deleted, even when the gpx layer is destroyed before the correlation listener is called

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)

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

@@ -380 +380 @@
                 GpxData removedGpxData = ((GpxDataContainer) layer).getGpxData();
                 for (int i = gpxModel.getSize() - 1; i >= 0; i--) {
-                    if (gpxModel.getElementAt(i).data.equals(removedGpxData)) {
+                    GpxData data = gpxModel.getElementAt(i).data;
+                    // removedGpxData can be null if gpx layer has been destroyed before this listener
+                    if (data.equals(removedGpxData) || (removedGpxData == null && data.isEmpty())) {
                         gpxModel.removeElementAt(i);
                         forEachLayer(correlateAction -> {