small tweak to button code

2008-01-11 15:28:09 +00:00
parent 941de6d3db
commit 4431a2f8ed
2 changed files with 4 additions and 7 deletions
@@ -188,16 +188,14 @@ function Button:Update()
 		self.border:Hide()
 	end
 	
-	if ( GameTooltip:IsOwned(self) ) then
+	if ( GameTooltip:GetOwner() == self) then
 		self:SetTooltip()
-	else
-		self.UpdateTooltip = nil
 	end
 	
-	if self.parent.config.hidemacrotext then
-		self.macroName:SetText("")
-	else
+	if not IsConsumableAction(action) and not IsStackableAction(action) and not self.parent.config.hidemacrotext then
 		self.macroName:SetText(GetActionText(action))
+	else
+		self.macroName:SetText("")
 	end
 	
 end