Merge branch 'main' into Fairview

MatejGolian · Oct 19, 2024 · 11262e3 · 11262e3
2 parents f13d8f4 + 96207f0
commit 11262e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+-   Hopefully fixed a rare bug in AccessibleMenu
+
 ## [0.5.0] - 2024-10-18
 
 ### Added

diff --git a/Lib/AccessibleMenu.ahk b/Lib/AccessibleMenu.ahk
@@ -11,7 +11,11 @@ Class AccessibleMenu {
     DisabledString := "unavailable"
     LeavingMenuString := "leaving menu"
     SubmenuString := "submenu"
-    Static Translations := AccessibleMenu.SetupTranslations()
+    Static Translations := Map()
+
+    Static __New() {
+        AccessibleMenu.Translations := AccessibleMenu.SetupTranslations()
+    }
 
     Add(MenuItemName, CallbackOrSubmenu := "", Options := "") {
         MenuItemName := Trim(MenuItemName)
@@ -242,9 +246,11 @@ Class AccessibleMenu {
                 Return
             }
             Else {
+                SingleKey := ""
                 If SubStr(KeyCombo, 1, 1) = "+" And StrLen(SubStr(KeyCombo, 2)) = 1
                 SingleKey := SubStr(KeyCombo, 2)
                 Else
+                If AccessibleMenu.CurrentMenu Is AccessibleMenu
                 SingleKey := AccessibleMenu.CurrentMenu.KeyWaitSingle()
                 If SubStr(SingleKey, 1, 6) = "Numpad"
                 SingleKey := SubStr(SingleKey, 7)