comix update
Munglunch [11-18-14 - 18:36]
diff --git a/Interface/AddOns/SVUI/framework/framework.lua b/Interface/AddOns/SVUI/framework/framework.lua
index d1b1eaf..59d2a3b 100644
--- a/Interface/AddOns/SVUI/framework/framework.lua
+++ b/Interface/AddOns/SVUI/framework/framework.lua
@@ -28,9 +28,9 @@ GET ADDON DATA
local SV = select(2, ...);
function SV:LoadFramework()
- self.Dropdown:Initialize()
+ self.Dropdown:Initialize();
self.Dock:Initialize();
self.Mentalo:Initialize();
- self.Comix:Initialize()
- self.GameMenu:Initialize()
+ self.Comix:Initialize();
+ self.GameMenu:Initialize();
end
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua b/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua
index f7ea3c6..8934c8d 100644
--- a/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua
+++ b/Interface/AddOns/SVUI/framework/widgets/widget_comix.lua
@@ -136,6 +136,11 @@ function SV.Comix:LaunchPopup()
end
local Comix_OnEvent = function(self, event, ...)
+ if(not SV.db.general.comix) then
+ self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+ self:SetScript("OnEvent", nil)
+ return
+ end
local subEvent = select(2,...)
local guid = select(4,...)
local ready = self:ReadyState()
@@ -151,13 +156,13 @@ local Comix_OnEvent = function(self, event, ...)
end
end
-function SV:ToggleComix()
- if not self.db.general.comix then
- self.Comix:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
- self.Comix:SetScript("OnEvent", nil)
+function SV.Comix:Toggle(enabled)
+ if(not enabled) then
+ self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+ self:SetScript("OnEvent", nil)
else
- self.Comix:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
- self.Comix:SetScript("OnEvent", Comix_OnEvent)
+ self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+ self:SetScript("OnEvent", Comix_OnEvent)
end
end
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
index 988a57e..08693d5 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua
@@ -307,7 +307,7 @@ SV.Options.args.common = {
type = 'toggle',
name = L["Enable Comic Popups"],
get = function(j)return SV.db.general.comix end,
- set = function(j,value) SV.db.general.comix = value; SV:ToggleComix() end
+ set = function(j,value) SV.db.general.comix = value; SV.Comix:Toggle(value) end
},
bigComix = {
order = 1,