Quantcast

- bug fix with toggle spells

Sidoine De Wispelaere [01-21-10 - 18:59]
- bug fix with toggle spells
- should not move icons when no action is shown

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@212 d5049fe3-3747-40f7-a4b5-f36d6801af5f
Filename
Ovale.lua
Ovale.toc
OvaleFrame.lua
diff --git a/Ovale.lua b/Ovale.lua
index 2de922b..db974e3 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -1061,8 +1061,10 @@ function Ovale:InitCalculerMeilleureAction()
 		if (spell) then
 			self:AddSpellToStack(spell, startTime/1000, endTime/1000, endTime/1000)
 		elseif self.lastSpellName then
-			if self.lastSpellName and self.maintenant - self.lastSpellTime<1 then
-				self:AddSpellToStack(self.lastSpellName, self.lastSpellTime, self.lastSpellTime, self.lastSpellTime)
+			if not self.spellInfo[self.lastSpellName] or not self.spellInfo[self.lastSpellName].toggle then
+				if self.lastSpellName and self.maintenant - self.lastSpellTime<1 then
+					self:AddSpellToStack(self.lastSpellName, self.lastSpellTime, self.lastSpellTime, self.lastSpellTime)
+				end
 			end
 		end
 	end
diff --git a/Ovale.toc b/Ovale.toc
index 943c7a0..d9528c5 100644
--- a/Ovale.toc
+++ b/Ovale.toc
@@ -3,7 +3,7 @@
 ## Notes: Show the icon of the next spell to cast
 ## Notes-frFR: Affiche l'icône du prochain sort à lancer
 ## Author: Sidoine
-## Version: 3.3.17
+## Version: 3.3.18
 ## OptionalDeps: Ace3, ButtonFacade, Recount, LibBabble-CreatureType-3.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/OvaleFrame.lua b/OvaleFrame.lua
index 0a5b943..3d00741 100644
--- a/OvaleFrame.lua
+++ b/OvaleFrame.lua
@@ -173,7 +173,7 @@ do
 				action.waitStart = nil
 			end

-			if Ovale.db.profile.apparence.moving and start then
+			if Ovale.db.profile.apparence.moving and action.icons[1].debutAction and action.icons[1].finAction then
 				local top=1-(Ovale.maintenant - action.icons[1].debutAction)/(action.icons[1].finAction-action.icons[1].debutAction)
 				if top<0 then
 					top = 0