Changeset 18729 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2023-05-16T18:32:14+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22922: RejectedExecutionException during JOSM shutdown when user has multiple geotagged image layers

The reason this occurs is that the ImageViewerDialog listens for layer removal
events and updates the image tabs based off of the removed layer and which layers
are remaining.

File:

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

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

@@ -178 +178 @@
         // This listener gets called _prior to_ the reorder event. If we do not delay the execution of the
         // model update, then the image will change instead of remaining the same.
-        this.layers.getModel().addChangeListener(l -> MainApplication.worker.execute(() -> GuiHelper.runInEDT(() -> {
-            Component selected = this.layers.getSelectedComponent();
-            if (selected instanceof MoveImgDisplayPanel) {
-                ((MoveImgDisplayPanel<?>) selected).fireModelUpdate();
-            }
-        })));
+        this.layers.getModel().addChangeListener(l -> {
+            // We need to check to see whether or not the worker is shut down. See #22922 for details.
+            if (!MainApplication.worker.isShutdown()) {
+                MainApplication.worker.execute(() -> GuiHelper.runInEDT(() -> {
+                    Component selected = this.layers.getSelectedComponent();
+                    if (selected instanceof MoveImgDisplayPanel) {
+                        ((MoveImgDisplayPanel<?>) selected).fireModelUpdate();
+                    }
+                }));
+            }});
     }