From 5d405167ab8c069d0c287d83b60fe93042460923 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Wed, 24 Jun 2015 20:56:10 +0400 Subject: [PATCH] checking for ora enabled to deal with raid manager role icons --- ElvUI_SLE/core/globals.lua | 3 +++ ElvUI_SLE/modules/raidroleicons.lua | 5 ++++- ElvUI_SLE/options/raidroleicons_c.lua | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ElvUI_SLE/core/globals.lua b/ElvUI_SLE/core/globals.lua index 576e647..944b606 100755 --- a/ElvUI_SLE/core/globals.lua +++ b/ElvUI_SLE/core/globals.lua @@ -28,6 +28,9 @@ local classTable = { warlock = blizzPath..[[ClassIcon_Warlock:16:16|t ]], warrior = blizzPath..[[ClassIcon_Warrior:16:16|t ]], } +--Check if oRA3 happens to be enabled +local enable = GetAddOnEnableState(E.myname, "oRA3") +if enable == 0 then SLE.oraenabled = false else SLE.oraenabled = true end E.SLEConfigs = {} diff --git a/ElvUI_SLE/modules/raidroleicons.lua b/ElvUI_SLE/modules/raidroleicons.lua index f151f5a..c3bc96b 100644 --- a/ElvUI_SLE/modules/raidroleicons.lua +++ b/ElvUI_SLE/modules/raidroleicons.lua @@ -44,4 +44,7 @@ function B:RaidLoaded(event, addon) end end -B:RegisterEvent("ADDON_LOADED", "RaidLoaded") \ No newline at end of file +if not SLE.oraenabled then + B:RegisterEvent("ADDON_LOADED", "RaidLoaded") +end + diff --git a/ElvUI_SLE/options/raidroleicons_c.lua b/ElvUI_SLE/options/raidroleicons_c.lua index cd55b5c..bcc9a71 100644 --- a/ElvUI_SLE/options/raidroleicons_c.lua +++ b/ElvUI_SLE/options/raidroleicons_c.lua @@ -7,6 +7,7 @@ local function configTable() type = "group", name = RAID..[[ |TInterface\OptionsFrame\UI-OptionsFrame-NewFeatureIcon:0:0:0:-1|t]], order = 80, + disabled = function() return SLE.oraenabled end, args = { header = { order = 1, -- 1.7.9.5