From 3104470762eb636ab35dbf7c2622c587e313eacd Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Tue, 8 Jan 2013 21:01:49 +0100
Subject: [PATCH] * Fixed: Modules now can be disabled * Fixed: Lua error on
 detect talent

---
 Change_log.txt   |    4 ++++
 Ele_GUI.lua      |    2 +-
 Elementarist.lua |    6 +++---
 Elementarist.toc |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Change_log.txt b/Change_log.txt
index 9313822..be32bc8 100755
--- a/Change_log.txt
+++ b/Change_log.txt
@@ -1,3 +1,7 @@
+**v3.1.2**
+* Fixed: Modules now can be disabled
+* Fixed: Lua error on detect talent
+
 **v3.1.1**
 * Fixed: Crash if loaded while not playing with Shaman
 
diff --git a/Ele_GUI.lua b/Ele_GUI.lua
index 22d4bb8..0cd6b20 100755
--- a/Ele_GUI.lua
+++ b/Ele_GUI.lua
@@ -422,7 +422,7 @@ function Elementarist:CreateConfig()
 				if (not ElementaristDB.modules) then
 					ElementaristDB.modules = {};
 				end
-				if (not ElementaristDB.modules[i]) then
+				if (ElementaristDB.modules[i] == nil) then
 					ElementaristDB.modules[i] = {};
 					ElementaristDB.modules[i].enabled = true;
 				end
diff --git a/Elementarist.lua b/Elementarist.lua
index dea0ff5..d1639fc 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Elementarist 3.1.1
+-- Elementarist 3.1.2
 --
 -- 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.1.1';
+Elementarist.versionNumber = '3.1.2';
 Elementarist.enabled = true;
 Elementarist.playerName = UnitName("player")
 Elementarist.playerGUID = UnitGUID("player")
@@ -309,7 +309,7 @@ function Elementarist:detectTalent()
 	_, Elementarist.tier6Talent = GetTalentRowSelectionInfo(6)
 	
 	if (talent ~= "") and (talent ~= Elementarist.talent) then
-		if ((Elementarist.modules[talent]) and (ElementaristDB.modules[talent]) and (Elementarist[talent].Initialize)) then
+		if (Elementarist.modules) and (ElementaristDB.modules) and (Elementarist.modules[talent]) and (ElementaristDB.modules[talent]) and (Elementarist[talent].Initialize) then
 			Elementarist.callbacks = {};
 			Elementarist[talent]:Initialize();
 		end;
diff --git a/Elementarist.toc b/Elementarist.toc
index 8904423..ff591b8 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.1.1
+## Version: 3.1.2
 ## SavedVariables: ElementaristDB
 ## OptionalDeps: OmniCC, SpellFlash
 ## Dependencies: 
-- 
1.7.9.5