Changeset 7660 in josm for trunk/src/org


Ignore:
Timestamp:
2014-10-27T22:25:25+01:00 (5 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r7619 r7660  
    280280                imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
    281281            }
    282             setTitle("Geotagged Images" + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
     282            setTitle(tr("Geotagged Images") + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
    283283            StringBuilder osd = new StringBuilder(entry.getFile() != null ? entry.getFile().getName() : "");
    284284            if (entry.getElevation() != null) {
     
    301301            imgDisplay.setOsdText(osd.toString());
    302302        } else {
     303            // if this method is called to reinitialize dialog content with a blank image,
     304            // do not actually show the dialog again with a blank image if currently hidden (fix #10672)
     305            setTitle(tr("Geotagged Images"));
    303306            imgDisplay.setImage(null, null);
    304307            imgDisplay.setOsdText("");
     308            return;
    305309        }
    306310        if (! isDialogShowing()) {
Note: See TracChangeset for help on using the changeset viewer.