fix: #2208 errors around actions for monks

ascott18 · Sep 2, 2024 · 50aa03a · 50aa03a
1 parent c10dfc7
commit 50aa03a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Fix: #2197 upstream issue in LibSpellRange-1.0 with range checking in classic/cata.
 * Fix: #2201 Don't treat inactive hero talent trees as learned talents
 * Fix: #2210 Fix desync of current GCD duration
+* Fix: #2208 Uncommon issue with monk action bars
 
 
 ## v11.0.4

diff --git a/Components/Core/Common/Actions.lua b/Components/Core/Common/Actions.lua
@@ -76,24 +76,27 @@ local function UpdateActionSlots()
             -- Sometimes, FindBaseSpellByID can return `nil`.
             local baseId = FindBaseSpellByID(id);
             if baseId then
-                local baseName = strlowerCache[GetSpellName(baseId)]
                 spells[baseId] = true
-                spells[baseName] = true
                 MapSpellToAction(baseId, action)
-                MapSpellToAction(baseName, action)
+                if baseName then
+                    local baseName = strlowerCache[GetSpellName(baseId)]
+                    MapSpellToAction(baseName, action)
+                end
             end
 
             if C_Spell.GetOverrideSpell then
 
-                -- https://github.com/ascott18/TellMeWhen/issues/2205
-                -- I suspect GetOverrideSpell was returning nil too?
                 local overrideId = C_Spell.GetOverrideSpell(id);
                 if overrideId then
-                    local overrideName = strlowerCache[GetSpellName(overrideId)]
                     MapSpellToAction(overrideId, action)
-                    MapSpellToAction(overrideName, action)
                     spells[overrideId] = true
-                    spells[overrideName] = true
+
+                    -- overrideName being nil was the root cause of https://github.com/ascott18/TellMeWhen/issues/2208
+                    local overrideName = strlowerCache[GetSpellName(overrideId)]
+                    if overrideName then
+                        MapSpellToAction(overrideName, action)
+                        spells[overrideName] = true
+                    end
                 end
             end
 

diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
@@ -10,6 +10,7 @@ TMW.CHANGELOG = [==[
 * Fix: #2197 upstream issue in LibSpellRange-1.0 with range checking in classic/cata.
 * Fix: #2201 Don't treat inactive hero talent trees as learned talents
 * Fix: #2210 Fix desync of current GCD duration
+* Fix: #2208 Uncommon issue with monk action bars
 
 
 ## v11.0.4