From 962d54af631f385f3f61050b7d493ce45600daf9 Mon Sep 17 00:00:00 2001 From: MilleXIV Date: Thu, 1 Sep 2016 17:24:44 -0400 Subject: [PATCH] Pulling in updates from Gethe of RealUI --- Libs/LibArtifactData-1.0/LibArtifactData-1.0.lua | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Libs/LibArtifactData-1.0/LibArtifactData-1.0.lua b/Libs/LibArtifactData-1.0/LibArtifactData-1.0.lua index 97621d5..aae7f50 100644 --- a/Libs/LibArtifactData-1.0/LibArtifactData-1.0.lua +++ b/Libs/LibArtifactData-1.0/LibArtifactData-1.0.lua @@ -1,4 +1,4 @@ -local MAJOR, MINOR = "LibArtifactData-1.0", 5 +local MAJOR, MINOR = "LibArtifactData-1.0", 6 assert(_G.LibStub, MAJOR .. " requires LibStub") local lib = _G.LibStub:NewLibrary(MAJOR, MINOR) @@ -85,26 +85,22 @@ end local function PrepareForScan() frame:UnregisterEvent("ARTIFACT_UPDATE") - local ArtifactFrame = _G.ArtifactFrame + _G.UIParent:UnregisterEvent("ARTIFACT_UPDATE") - if not ArtifactFrame or not ArtifactFrame:IsShown() then - _G.UIParent:UnregisterEvent("ARTIFACT_UPDATE") - if ArtifactFrame then - ArtifactFrame:UnregisterEvent("ARTIFACT_UPDATE") - end + local ArtifactFrame = _G.ArtifactFrame + if ArtifactFrame and not ArtifactFrame:IsShown() then + ArtifactFrame:UnregisterEvent("ARTIFACT_UPDATE") end end local function RestoreStateAfterScan() frame:RegisterEvent("ARTIFACT_UPDATE") - local ArtifactFrame = _G.ArtifactFrame + _G.UIParent:RegisterEvent("ARTIFACT_UPDATE") - if not ArtifactFrame or not ArtifactFrame:IsShown() then + local ArtifactFrame = _G.ArtifactFrame + if ArtifactFrame and not ArtifactFrame:IsShown() then Clear() - if ArtifactFrame then - ArtifactFrame:RegisterEvent("ARTIFACT_UPDATE") - end - _G.UIParent:RegisterEvent("ARTIFACT_UPDATE") + ArtifactFrame:RegisterEvent("ARTIFACT_UPDATE") end end @@ -313,6 +309,7 @@ function private.PLAYER_ENTERING_WORLD(event) InitializeScan(event) frame:RegisterEvent("PLAYER_EQUIPMENT_CHANGED") frame:RegisterEvent("CURRENCY_DISPLAY_UPDATE") + frame:UnregisterEvent("PLAYER_ENTERING_WORLD") end) end -- 1.7.9.5