Fix #23362: Cannot close ImageViewerDialog when multiple image layers…

… are available

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18934 0c6e7542-c601-0410-84e7-c038aed88b3b

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

@@ -179,7 +179,7 @@ private ImageViewerDialog() {
         // model update, then the image will change instead of remaining the same.
         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();
                     if (selected instanceof MoveImgDisplayPanel) {
@@ -190,6 +190,15 @@ private ImageViewerDialog() {
         });
     }
 
+    @Override
+    public void showNotify() {
+        super.showNotify();
+        Component selected = this.layers.getSelectedComponent();
+        if (selected instanceof MoveImgDisplayPanel) {
+            ((MoveImgDisplayPanel<?>) selected).fireModelUpdate();
+        }
+    }
+
     @Override
     public void hideNotify() {
         super.hideNotify();
@@ -929,7 +938,7 @@ public void displayImages(List<? extends IImageEntry<?>> entries) {
         }
         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();
             dialogsPanel.reconstruct(DialogsPanel.Action.COLLAPSED_TO_DEFAULT, this);