From 290b3e1d0f05918ba0e62a0c2484a59f0bc40ec4 Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Tue, 10 Mar 2015 16:49:47 +0100
Subject: [PATCH] ***v3.4.1 * Fixed: Liquid Magma * Fixed: Cooldown animations
 removed correctly once finished

---
 Change_log.txt        |    4 ++++
 Elementarist.lua      |    7 +++++--
 Elementarist.toc      |    2 +-
 modules/elemental.lua |   11 ++++++++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Change_log.txt b/Change_log.txt
index 0322ffb..7b5c71a 100755
--- a/Change_log.txt
+++ b/Change_log.txt
@@ -1,3 +1,7 @@
+***v3.4.1
+* Fixed: Liquid Magma
+* Fixed: Cooldown animations removed correctly once finished
+
 ***v3.4.0
 * Change: 6.1 compatibility
 * Added: Liquid Magma
diff --git a/Elementarist.lua b/Elementarist.lua
index 0c6439d..fc53564 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Elementarist 3.4.0
+-- Elementarist 3.4.1
 --
 -- Shows the advised spell for an elemental shaman for optimal DPS output.
 -------------------------------------------------------------------------------
@@ -8,7 +8,7 @@ Elementarist = {Locals = {}}
 
 local L = Elementarist.Locals
 
-Elementarist.versionNumber = '3.4.0';
+Elementarist.versionNumber = '3.4.1';
 Elementarist.enabled = true;
 Elementarist.playerName = UnitName("player")
 Elementarist.playerGUID = UnitGUID("player")
@@ -637,6 +637,7 @@ function Elementarist:UpdateShieldTracker()
 		Elementarist:SetTexture(Elementarist.textureList["shield"],"")
 		Elementarist.textList["shield"]:SetText("")
 		Elementarist.shieldCooldownFrame:SetCooldown(0, 0)
+		Elementarist.shieldCooldownFrame:SetDrawBling(false)
 	end
 end
 
@@ -684,6 +685,7 @@ function Elementarist:UpdateAuraTracker()
 	for i=m,10,1 do
 		Elementarist:SetTexture(Elementarist.textureList["debuff_" .. tostring(m)],"")
 		Elementarist.auraCooldownFrame["mini_" .. tostring(m)]:SetCooldown( 0, 0)
+		Elementarist.auraCooldownFrame["mini_" .. tostring(m)]:SetDrawBling(false)
 	end
 
 	-- update main frame
@@ -698,6 +700,7 @@ function Elementarist:UpdateAuraTracker()
 			Elementarist:SetTexture(Elementarist.textureList["debuff"],"")
 			Elementarist.textList["debuff"]:SetText("")
 			Elementarist.auraCooldownFrame["main"]:SetCooldown(0, 0)
+			Elementarist.auraCooldownFrame["main"]:SetDrawBling(false)
 			m = m - 1
 		end
 	end;
diff --git a/Elementarist.toc b/Elementarist.toc
index b9ed95e..1fc585b 100755
--- a/Elementarist.toc
+++ b/Elementarist.toc
@@ -2,7 +2,7 @@
 ## Title: Elementarist
 ## Notes: Elemental shaman spell rotation helper
 ## Author: Taracque, Felmosórongy of Arathor
-## Version: 3.4.0
+## Version: 3.4.1
 ## SavedVariables: ElementaristDB
 ## OptionalDeps: OmniCC, SpellFlash
 ## Dependencies: 
diff --git a/modules/elemental.lua b/modules/elemental.lua
index 0153e19..17bd44a 100755
--- a/modules/elemental.lua
+++ b/modules/elemental.lua
@@ -110,9 +110,14 @@ Elementarist.elemental = {
 		
 		-- if Tier7 talent is Liquid Magma and fire totem has 10 sec or more, use it
 		if (Elementarist.tier7Talent == 21200) then
-			local haveFireTotem,fireTotemName,d,_ = GetTotemInfo(1);
-			if (fireTotemName ~= "") and (d-timeshift > 10) then
-				return Elementarist.SpellList["Liquid Magma"]
+			if (exspell1 ~= Elementarist.SpellList["Liquid Magma"]) and (exspell2 ~= Elementarist.SpellList["Liquid Magma"]) and ((Elementarist.SpellList["Liquid Magma"]) ~= spellInCast) then
+				local haveFireTotem,fireTotemName,d,_ = GetTotemInfo(1);
+				if (fireTotemName ~= "") and (d-timeshift > 10) then
+					d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Liquid Magma"])
+					if (d-timeshift <= 0) then
+						return Elementarist.SpellList["Liquid Magma"]
+					end
+				end
 			end
 		end
 
-- 
1.7.9.5