fixes #260

Objects/ACTIONBUTTON.lua

@@ -654,17 +654,16 @@ end
 
 function ACTIONBUTTON:SetSpellState(spell)
 	local charges, maxCharges, chargeStart, chargeDuration = GetSpellCharges(spell)
+	local count = GetSpellCount(spell)
+
 	if (maxCharges and maxCharges > 1) then
 		self.count:SetText(charges)
+	elseif count and count > 0 then
+		self.count:SetText(count)
 	else
 		self.count:SetText("")
 	end
 
-	local count = GetSpellCount(spell)
-	if (count and count > 0) then
-		self.count:SetText(count)
-	end
-
 	if (NeuronCollectionCache[spell:lower()]) then
 		spell = NeuronCollectionCache[spell:lower()].spellID
 
@@ -1028,6 +1027,7 @@ end
 ACTIONBUTTON.MODIFIER_STATE_CHANGED = ACTIONBUTTON.SPELLS_CHANGED
 
 
+
 function ACTIONBUTTON:ACTIONBAR_SLOT_CHANGED(...)
 	if (self.data.macro_Watch or self.data.macro_Equip) then
 		self:UpdateIcon()
@@ -1085,8 +1085,12 @@ function ACTIONBUTTON:SPELL_UPDATE_CHARGES(...)
 	local spell = self.macrospell
 	local charges, maxCharges, chargeStart, chargeDuration = GetSpellCharges(spell)
 
+	local count = GetSpellCount(spell)
+
 	if (maxCharges and maxCharges > 1) then
 		self.count:SetText(charges)
+	elseif count and count > 0 then
+		self.count:SetText(count)
 	else
 		self.count:SetText("")
 	end

Objects/BUTTON.lua

@@ -638,8 +638,6 @@ function BUTTON:UpdateCooldown()
 		self:SetSpellCooldown(spell)
 	elseif (item and #item>0) then
 		self:SetItemCooldown(item)
-	else
-		self:SetCooldownTimer(0, 0, 0)
 	end
 end
 

Objects/EXTRABTN.lua

@@ -95,7 +95,9 @@ function EXTRABTN:ExtraButton_Update()
 
 	self.spellName, _, self.spellIcon = GetSpellInfo(self.spellID);
 
-	self:SetAttribute("action", self.actionID)
+	if not InCombatLockdown() then
+		self:SetAttribute("action", self.actionID)
+	end
 
 	if self.spellID then
 		self:SetButtonTex()