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

Timestamp:

2014-10-27T22:25:25+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10672 - empty image window opens in several situations (regression from r7444)

File:

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

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

@@ -280 +280 @@
                 imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
             }
-            setTitle("Geotagged Images" + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
+            setTitle(tr("Geotagged Images") + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
             StringBuilder osd = new StringBuilder(entry.getFile() != null ? entry.getFile().getName() : "");
             if (entry.getElevation() != null) {
@@ -301 +301 @@
             imgDisplay.setOsdText(osd.toString());
         } else {
+            // if this method is called to reinitialize dialog content with a blank image,
+            // do not actually show the dialog again with a blank image if currently hidden (fix #10672)
+            setTitle(tr("Geotagged Images"));
             imgDisplay.setImage(null, null);
             imgDisplay.setOsdText("");
+            return;
         }
         if (! isDialogShowing()) {