Mercurial > wow > mailopener

diff Core.lua @ 126:31f58e9c16e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed double loading of ZeroAuctions when using AddonLoader.
author Zerotorescue
date Sat, 16 Oct 2010 15:27:51 +0200
parents b21c39ea338c
children b54116796220
line wrap: on
line diff
--- a/Core.lua	Sat Oct 16 15:00:39 2010 +0200
+++ b/Core.lua	Sat Oct 16 15:27:51 2010 +0200
@@ -284,7 +284,7 @@
 		self.PostalEnabled = true; -- Set this as an object variable so we can use it in our modules
 		
 		-- Ensure this addon is loaded if AddonLoader is installed
-		if AddonLoader and AddonLoader.LoadAddOn and not Postal then
+		if AddonLoader and AddonLoader.LoadAddOn and not IsAddOnLoaded("Postal") and not Postal then
 			AddonLoader:LoadAddOn("Postal");
 		end
 	end
@@ -293,7 +293,7 @@
 		self.ZeroAuctionsEnabled = true; -- Set this as an object variable so we can use it in our modules
 		
 		-- Ensure this addon is loaded if AddonLoader is installed
-		if AddonLoader and AddonLoader.LoadAddOn then
+		if AddonLoader and AddonLoader.LoadAddOn and not IsAddOnLoaded("ZeroAuctions") then
 			AddonLoader:LoadAddOn("ZeroAuctions");
 		end
 	end