comparison SkeletonKey/KeyButton.lua @ 62:04c23ceaf9e0

- fix taint caused by loading in combat
author Nenue
date Mon, 05 Sep 2016 14:56:38 -0400
parents c416c9e6d212
children 2409fe9b81e1
comparison
equal deleted inserted replaced
61:b7be92f62b05 62:04c23ceaf9e0
141 name, _, icon = GetMountInfoByID(actionID) 141 name, _, icon = GetMountInfoByID(actionID)
142 end 142 end
143 elseif actionType == 'item' then 143 elseif actionType == 'item' then
144 name = GetItemInfo(actionID) 144 name = GetItemInfo(actionID)
145 icon = GetItemIcon(actionID) 145 icon = GetItemIcon(actionID)
146 actionID = name
147 elseif actionType == 'battlepet' then 146 elseif actionType == 'battlepet' then
148 147
149 local speciesID, customName, level, xp, maxXp, displayID, isFavorite, petName, petIcon, petType, creatureID = GetPetInfoByPetID(actionID) 148 local speciesID, customName, level, xp, maxXp, displayID, isFavorite, petName, petIcon, petType, creatureID = GetPetInfoByPetID(actionID)
150 name = customName or petName 149 name = customName or petName
151 icon = petIcon 150 icon = petIcon