Changeset 4480 in josm

Timestamp:

2011-10-01T01:10:26+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #6876 - ParallelWayMode crashes without a edit layer

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -724 +724 @@
          * order. This way it works as visual clue for new users */
         for (Enumeration<AbstractButton> e = Main.map.toolGroup.getElements() ; e.hasMoreElements() ;) {
-            AbstractButton x=e.nextElement();
-            x.setEnabled(((MapMode)x.getAction()).layerIsSupported(layer));
+            AbstractButton button = e.nextElement();
+            MapMode mode = (MapMode)button.getAction();
+            boolean isLayerSupported = mode.layerIsSupported(layer); 
+            button.setEnabled(isLayerSupported);
+            // Also update associated shortcut (fix #6876)
+            if (isLayerSupported) {
+                Main.registerActionShortcut(mode, mode.getShortcut());
+            } else {
+                Main.unregisterActionShortcut(mode.getShortcut());
+            }
         }
         AudioPlayer.reset();