Changeset 12320 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-06-06T01:27:55+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #11111 - don't register automatic shortcuts

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (2 diffs)
• tools/PlatformHook.java (modified) (1 diff)

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

@@ -76 +76 @@
         setHelpId();
         sc = shortcut;
-        if (sc != null) {
+        if (sc != null && !sc.isAutomatic()) {
             Main.registerActionShortcut(this, sc);
         }
@@ -215 +215 @@
     @Override
     public void destroy() {
-        if (sc != null) {
+        if (sc != null && !sc.isAutomatic()) {
             Main.unregisterActionShortcut(this);
         }

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -80 +80 @@
       * it or registered from within the application.
       *
-      * Plese note that you are not allowed to register any
+      * Please note that you are not allowed to register any
       * shortuts from this hook, but only "systemCuts"!
       *