If we are loading a library that depends on a separate library, we ne…

…ed to verify that separate library exists prior to telling LibStub to create our library. This resolves addons with broken library setups affecting addons with working library setups.
lantisnt · Aug 12, 2017 · e4f8470 · e4f8470
1 parent 4157754
commit e4f8470
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/AceComm-3.0/AceComm-3.0.lua b/AceComm-3.0/AceComm-3.0.lua
@@ -17,15 +17,14 @@ TODO: Time out old data rotting around from dead senders? Not a HUGE deal since
 
 ]]
 
-local MAJOR, MINOR = "AceComm-3.0", 9
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+local CTL = assert(ChatThrottleLib, "AceComm-3.0 requires ChatThrottleLib")
 
+local MAJOR, MINOR = "AceComm-3.0", 9
 local AceComm,oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceComm then return end
 
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-local CTL = assert(ChatThrottleLib, "AceComm-3.0 requires ChatThrottleLib")
-
 -- Lua APIs
 local type, next, pairs, tostring = type, next, pairs, tostring
 local strsub, strfind = string.sub, string.find

diff --git a/AceConfig-3.0/AceConfig-3.0.lua b/AceConfig-3.0/AceConfig-3.0.lua
@@ -12,13 +12,14 @@ Very light wrapper library that combines all the AceConfig subcomponents into on
 
 ]]
 
+local cfgreg = LibStub("AceConfigRegistry-3.0")
+local cfgcmd = LibStub("AceConfigCmd-3.0")
+
 local MAJOR, MINOR = "AceConfig-3.0", 2
 local AceConfig = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfig then return end
 
-local cfgreg = LibStub("AceConfigRegistry-3.0")
-local cfgcmd = LibStub("AceConfigCmd-3.0")
 --TODO: local cfgdlg = LibStub("AceConfigDialog-3.0", true)
 --TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0", true)
 

diff --git a/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua b/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
@@ -14,6 +14,7 @@ REQUIRES: AceConsole-3.0 for command registration (loaded on demand)
 
 -- TODO: plugin args
 
+local cfgreg = LibStub("AceConfigRegistry-3.0")
 
 local MAJOR, MINOR = "AceConfigCmd-3.0", 13
 local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR)
@@ -23,7 +24,6 @@ if not AceConfigCmd then return end
 AceConfigCmd.commands = AceConfigCmd.commands or {}
 local commands = AceConfigCmd.commands
 
-local cfgreg = LibStub("AceConfigRegistry-3.0")
 local AceConsole -- LoD
 local AceConsoleName = "AceConsole-3.0"
 

diff --git a/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
@@ -4,6 +4,9 @@
 -- @release $Id$
 
 local LibStub = LibStub
+local gui = LibStub("AceGUI-3.0")
+local reg = LibStub("AceConfigRegistry-3.0")
+
 local MAJOR, MINOR = "AceConfigDialog-3.0", 61
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
@@ -17,9 +20,6 @@ AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
 AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
 AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
 
-local gui = LibStub("AceGUI-3.0")
-local reg = LibStub("AceConfigRegistry-3.0")
-
 -- Lua APIs
 local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort
 local strmatch, format = string.match, string.format

diff --git a/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua b/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
@@ -9,15 +9,15 @@
 -- @class file
 -- @name AceConfigRegistry-3.0
 -- @release $Id$
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+
 local MAJOR, MINOR = "AceConfigRegistry-3.0", 16
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigRegistry then return end
 
 AceConfigRegistry.tables = AceConfigRegistry.tables or {}
 
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
 if not AceConfigRegistry.callbacks then
  AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry)
 end

diff --git a/AceEvent-3.0/AceEvent-3.0.lua b/AceEvent-3.0/AceEvent-3.0.lua
@@ -10,6 +10,8 @@
 -- @class file
 -- @name AceEvent-3.0
 -- @release $Id$
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+
 local MAJOR, MINOR = "AceEvent-3.0", 3
 local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
 
@@ -18,8 +20,6 @@ if not AceEvent then return end
 -- Lua APIs
 local pairs = pairs
 
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
 AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame
 AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib