Changeset 18934 in josm for trunk

Timestamp:

2024-01-03T16:22:55+01:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #23362: Cannot close ImageViewerDialog when multiple image layers are available

File:

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

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

@@ -180 +180 @@
         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()) {
+            if (!MainApplication.worker.isShutdown() && this.isDialogShowing()) {
                 MainApplication.worker.execute(() -> GuiHelper.runInEDT(() -> {
                     Component selected = this.layers.getSelectedComponent();
@@ -189 +189 @@
             }
         });
+    }
+
+    @Override
+    public void showNotify() {
+        super.showNotify();
+        Component selected = this.layers.getSelectedComponent();
+        if (selected instanceof MoveImgDisplayPanel) {
+            ((MoveImgDisplayPanel<?>) selected).fireModelUpdate();
+        }
     }
 
@@ -930 +939 @@
         if (!isDialogShowing()) {
             setIsDocked(false); // always open a detached window when an image is clicked and dialog is closed
-            showDialog();
+            unfurlDialog();
         } else if (isDocked && isCollapsed) {
             expand();