Merge branch 'master' into wrath
This commit is contained in:
commit
c7dd6ac8e2
2 changed files with 6 additions and 2 deletions
|
|
@ -15,7 +15,9 @@ local _G = _G
|
|||
local format = string.format
|
||||
|
||||
local function onEnter(self, ...)
|
||||
self:OnEnter(...)
|
||||
if not (Bartender4.db.profile.tooltip == "nocombat" and InCombatLockdown()) and Bartender4.db.profile.tooltip ~= "disabled" then
|
||||
self:OnEnter(...)
|
||||
end
|
||||
KeyBound:Set(self)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -154,7 +154,9 @@ function StanceButtonPrototype:ClearSetPoint(...)
|
|||
end
|
||||
|
||||
local function onEnter(self, ...)
|
||||
self:OnEnter(...)
|
||||
if not (Bartender4.db.profile.tooltip == "nocombat" and InCombatLockdown()) and Bartender4.db.profile.tooltip ~= "disabled" then
|
||||
self:OnEnter(...)
|
||||
end
|
||||
KeyBound:Set(self)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue