From 93ffa922e2c16269718746c965ab36a7e3c92ea9 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Fri, 4 Dec 2009 19:38:53 +0000
Subject: [PATCH] nored=1 option for Spell() was not working

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@154 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Ovale.toc      |    2 +-
 OvaleFrame.lua |   11 +++++------
 OvaleIcone.lua |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Ovale.toc b/Ovale.toc
index e1b67fd..205d437 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.2.22
+## Version: 3.2.23
 ## OptionalDeps: Ace3, ButtonFacade, Recount
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/OvaleFrame.lua b/OvaleFrame.lua
index bdfea13..56ccf45 100644
--- a/OvaleFrame.lua
+++ b/OvaleFrame.lua
@@ -152,12 +152,15 @@ do
 			
 			local actionTexture, actionInRange, actionCooldownStart, actionCooldownDuration,
 					actionUsable, actionShortcut, actionIsCurrent, actionEnable, spellName, actionTarget, noRed = Ovale:GetActionInfo(element)
+			if noRed then
+				start = actionCooldownStart + actionCooldownDuration
+			end
 			
 			if (node.params.nocd and node.params.nocd == 1 and start~=nil and start>Ovale.maintenant+1.5) then
 				action.icons[1]:Update(nil)
-			else			
+			else
 				action.icons[1]:Update(start, actionTexture, actionInRange, actionCooldownStart, actionCooldownDuration,
-					actionUsable, actionShortcut, actionIsCurrent, actionEnable, spellName, actionTarget, noRed)
+					actionUsable, actionShortcut, actionIsCurrent, actionEnable, spellName, actionTarget)
 			end
 			
 			action.spellName = spellName
@@ -223,10 +226,6 @@ do
 		if (Ovale.bug and not Ovale.traced) then
 			Ovale.trace = true
 		end	
-		
-		if noRed then
-			minAttente = actionCooldownStart + actionCooldownDuration
-		end
 	end
 	
 	local function UpdateIcons(self)
diff --git a/OvaleIcone.lua b/OvaleIcone.lua
index acf7054..c9745ee 100644
--- a/OvaleIcone.lua
+++ b/OvaleIcone.lua
@@ -2,7 +2,7 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("Ovale")
 
 local function Update(self, minAttente, actionTexture, actionInRange, actionCooldownStart, actionCooldownDuration,
-				actionUsable, actionShortcut, actionIsCurrent, actionEnable, spellName, actionTarget, noRed)
+				actionUsable, actionShortcut, actionIsCurrent, actionEnable, spellName, actionTarget)
 				
 		
 	if (minAttente~=nil and actionTexture) then	
-- 
1.7.9.5