Changeset 29388 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

Timestamp:

2013-03-23T18:45:59+01:00 (12 years ago)

Author:

zverik

Message:

probably the last alpha of iodb (or first beta, whatever)

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java (modified) (1 diff)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -214 +214 @@
         } else
             selectedOffset = null;
-        NavigatableComponent.removeZoomChangeListener(this);
-        setVisible(false);
+        boolean closeDialog = MODAL || selectedOffset == null
+                || selectedOffset instanceof CalibrationObject
+                || Main.pref.getBoolean("iodb.close.on.select", true);
+        if( closeDialog ) {
+            NavigatableComponent.removeZoomChangeListener(this);
+            setVisible(false);
+        }
         if( !MODAL ) {
-            Main.map.mapView.removeTemporaryLayer(this);
-            Main.map.mapView.repaint();
-            if( selectedOffset != null )
+            if( closeDialog ) {
+                Main.map.mapView.removeTemporaryLayer(this);
+                Main.map.mapView.repaint();
+            }
+            if( selectedOffset != null ) {
                 applyOffset();
+                if( !closeDialog )
+                    updateButtonPanel();
+            }
         }
     }