Merge branch 'master' into wrath
This commit is contained in:
+3
-1
@@ -15,7 +15,9 @@ local _G = _G
|
|||||||
local format = string.format
|
local format = string.format
|
||||||
|
|
||||||
local function onEnter(self, ...)
|
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)
|
KeyBound:Set(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -154,7 +154,9 @@ function StanceButtonPrototype:ClearSetPoint(...)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function onEnter(self, ...)
|
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)
|
KeyBound:Set(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user