From ad641714fa7d77607b77669bbe2ab41fafd8bf42 Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Fri, 2 Dec 2011 02:35:29 +0000
Subject: [PATCH] - and now for the correctly-merged version of the cd bar

---
 modules/CustomCDBar.lua | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/CustomCDBar.lua b/modules/CustomCDBar.lua
index d8e5f72..c4b28fd 100644
--- a/modules/CustomCDBar.lua
+++ b/modules/CustomCDBar.lua
@@ -481,14 +481,10 @@ function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
 	local localRemaining = nil
 	local localStart, localDuration, hasCooldown = GetSpellCooldown(buffName)
 
-	if (hasCooldown == 1 and localRemaining > 1.5) then
+	if (hasCooldown == 1) then
 		-- the item has a potential cooldown
 		if (localDuration <= 1.5) then
-			if (self.cooldownEndTime > now) then
-				return self.cooldownDuration, (self.cooldownEndTime - now)
-			else
-				return nil, nil
-			end
+			return nil, nil
 		end
 
 		localRemaining = localDuration + (localStart - now)