Merge branch 'master' into wrath

2008-09-06 11:53:11 +02:00
parent f9c9b4e8fd af35db6328
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