Merge branch 'master' of git.curseforge.net:wow/elementarist/mainline

diff --git a/Elementarist.lua b/Elementarist.lua
index fe15908..6b1a7ad 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -365,7 +365,7 @@ function Elementarist:InitSettings()
 	if ElementaristDB.trackAuraBuffs == nil then ElementaristDB.trackAuraBuffs = true end
 	if ElementaristDB.DpsTxtDisabled == nil then ElementaristDB.DpsTxtDisabled = false end
 	if ElementaristDB.maximizeFS == nil then ElementaristDB.maximizeFS = true end
-	if ElementaristDB.doFSThreshold == nil then ElementaristDB.doFSThreshold = 9 end
+	if ElementaristDB.doFSThreshold == nil then ElementaristDB.doFSThreshold = 12 end
 	if ElementaristDB.disableLM == nil then ElementaristDB.disableLM = false end
 	if ElementaristDB.showHealingStream == nil then ElementaristDB.showHealingStream = false end
 end
@@ -718,15 +718,19 @@ end


 function Elementarist:TrackAuraSaveBuffStatus()
-	if Elementarist.trackAuraBuffSpell1 then
+	if (Elementarist.trackAuraBuffSpell1) then
 		buffname, _, _,Elementarist.trackAuraBuffCount1 = Elementarist:hasBuff("player",Elementarist.trackAuraBuffSpell1)
 		if Elementarist.trackAuraBuffCount1 == nil then Elementarist.trackAuraBuffCount1 = 0 end
 		if buffname and (Elementarist.trackAuraBuffCount1 == 0) then Elementarist.trackAuraBuffCount1 = 1 end
+	else
+		Elementarist.trackAuraBuffCount1 = ""
 	end
-	if Elementarist.trackAuraBuffSpell2 then
+	if (Elementarist.trackAuraBuffSpell2) then
 		buffname, _, _,Elementarist.trackAuraBuffCount2 = Elementarist:hasBuff("player",Elementarist.trackAuraBuffSpell2)
 		if Elementarist.trackAuraBuffCount2 == nil then Elementarist.trackAuraBuffCount2 = 0 end
 		if buffname and (Elementarist.trackAuraBuffCount2 == 0) then Elementarist.trackAuraBuffCount2 = 1 end
+	else
+		Elementarist.trackAuraBuffCount2 = ""
 	end
 end