Changeset 3780 in josm

Timestamp:

Jan 8, 2011 12:51:03 PM (2 years ago)

Author:

Upliner

Message:

Fix #5791 Offset window cannot be opened after closing it with "Esc" key

File:

• trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -212 +212 @@
         @Override
         protected void buttonAction(int buttonIndex, ActionEvent evt) {
-            if (buttonIndex != 1 && tBookmarkName.getText() != null && !"".equals(tBookmarkName.getText()) &&
+            if (buttonIndex == 0 && tBookmarkName.getText() != null && !"".equals(tBookmarkName.getText()) &&
                     OffsetBookmark.getBookmarkByName(layer, tBookmarkName.getText()) != null) {
                 if (!confirmOverwriteBookmark()) return;
             }
             super.buttonAction(buttonIndex, evt);
+        }
+
+        @Override
+        public void setVisible(boolean visible) {
+            super.setVisible(visible);
+            if (visible) return;
             offsetDialog = null;
-            if (buttonIndex == 1) {
+            if (getValue() != 1) {
                 layer.setOffset(oldDx, oldDy);
             } else if (tBookmarkName.getText() != null && !"".equals(tBookmarkName.getText())) {