Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

Timestamp:

2012-06-24T19:14:38+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750: conflict dialog, nodes and members tab: allow selection via double-click, allow zoom via contexual menu, plus various fix in EDT violations

File:

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

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

@@ -82 +82 @@
     @Override
     protected void updateEnabledState() {
-        if (getEditLayer() == null) {
-            setEnabled(false);
-            return;
-        }
-        setEnabled(!LayerListDialog.getInstance().getModel().getPossibleMergeTargets(getEditLayer()).isEmpty());
+        GuiHelper.runInEDT(new Runnable() {
+            @Override
+            public void run() {
+                if (getEditLayer() == null) {
+                    setEnabled(false);
+                    return;
+                }
+                setEnabled(!LayerListDialog.getInstance().getModel().getPossibleMergeTargets(getEditLayer()).isEmpty());
+            }
+        });
     }