From de3d6c3e6cf5515c394df340aec0a94d0dac0f91 Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Mon, 13 Feb 2012 19:13:02 +0000
Subject: [PATCH] bug fix for DeadIn bug fix for OtherDebuffExpires

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

diff --git a/Condition.lua b/Condition.lua
index 9f9f1cc..026297d 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -184,12 +184,13 @@ local function getOtherAura(spellId, suppTime)
 	Ovale:EnableOtherAuras()
 	local otherAura = Ovale.otherAura[spellId]
 	if otherAura then
-	--	print("otherAura")
+		Ovale:Log("otherAura")
+		
 		local maxTime = 0
 		local minTime = nil
 		suppTime = suppTime or 10
 		for target,expireTime in pairs(otherAura) do
-	--		print("target "..target.. " "..expireTime)
+			Ovale:Log("target "..target.. " "..expireTime)
 			if target~=UnitGUID("target") then
 				if Ovale.maintenant - suppTime > expireTime then
 					otherAura[target] = nil
@@ -203,7 +204,7 @@ local function getOtherAura(spellId, suppTime)
 				end	
 			end
 		end
-	--	print("maxTime final "..maxTime)
+		Ovale:Log("maxTime final "..maxTime)
 		return minTime, maxTime
 	end
 	return nil
@@ -413,7 +414,7 @@ local function getTargetDead(target)
 			end
 		end
 	end
-	if not lastSPD[target] or lastSPD[target]<1 then
+	if not lastSPD[target] or lastSPD[target]<=0 then
 		return nil
 	end
 	-- Rough estimation
@@ -1000,9 +1001,9 @@ Ovale.conditions=
 		local minTime, maxTime = getOtherAura(condition[1], condition[3])
 		if minTime then
 			local timeBefore = condition[2] or 0
-			return minTime - timeBefore
+			return minTime - timeBefore, nil
 		end
-		return nil
+		return 0, nil
 	end,
 	OtherDebuffPresent = function(condition)
 		local minTime, maxTime = getOtherAura(condition[1], condition[3])
diff --git a/Ovale.toc b/Ovale.toc
index 0d954e9..c83df1b 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: 4.3.7
+## Version: 4.3.8
 ## OptionalDeps: Ace3, Masque, Recount, Skada, LibBabble-CreatureType-3.0, LibRangeCheck-2.0
 ## SavedVariables: OvaleDB
 ## SavedVariablesPerCharacter: OvaleDBPC
-- 
1.7.9.5