Fix flyouts and mounts

Lardeck · Feb 21, 2024 · c6429d5 · c6429d5
1 parent 3807aae
commit c6429d5
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/ImprovedTalentLoadouts.lua b/ImprovedTalentLoadouts.lua
@@ -1543,8 +1543,6 @@ function TalentLoadouts:UpdateActionBars(configInfo)
                 end
             elseif actionType == "spell" then
                 id = FindBaseSpellByID(id)
-            elseif actionType == "flyout" then
-                id = self.flyouts[id]
             end
 
             actionBars[actionSlot] = {
@@ -1582,6 +1580,7 @@ function TalentLoadouts:LoadActionBar(actionBars, name)
     if not success then return end
 
     self:UpdateMacros()
+    self:UpdateKnownFlyouts()
 
     if not next(data) then return end
 
@@ -1619,10 +1618,17 @@ function TalentLoadouts:LoadActionBar(actionBars, name)
                 end
             elseif slotInfo.type == "summonmount" then
                 local _, spellID = C_MountJournal.GetMountInfoByID(slotInfo.id)
-                PickupSpell(spellID)
+                if spellID then
+                    PickupSpell(spellID)
+                else
+                    C_MountJournal.Pickup(0)
+                end
+                pickedUp = true
+            elseif slotInfo.type == "companion" then
+                PickupSpell(slotInfo.id)
                 pickedUp = true
             elseif slotInfo.type == "flyout" then
-                PickupSpellBookItem(slotInfo.id, BOOKTYPE_SPELL)
+                PickupSpellBookItem(self.flyouts[slotInfo.id], BOOKTYPE_SPELL)
                 pickedUp = true
             elseif slotInfo.type == "item" then
                 PickupItem(slotInfo.id)