Quantcast

Don't call InitializeFrame() from addon:OnEnable() - call it from MainPanel:Display() if non-nil.

James D. Callahan III [06-19-10 - 06:24]
Don't call InitializeFrame() from addon:OnEnable() - call it from MainPanel:Display() if non-nil.
Filename
ARL.lua
Frame.lua
diff --git a/ARL.lua b/ARL.lua
index ac64096..05e3446 100644
--- a/ARL.lua
+++ b/ARL.lua
@@ -606,12 +606,6 @@ function addon:OnEnable()
 	end
 ]]--
 	-------------------------------------------------------------------------------
-	-- Initialize the main panel frame.
-	-------------------------------------------------------------------------------
-	self:InitializeFrame()
-	self.InitializeFrame = nil
-
-	-------------------------------------------------------------------------------
 	-- Initialize the player's data.
 	-------------------------------------------------------------------------------
 	do
diff --git a/Frame.lua b/Frame.lua
index 52d881e..0ca5d8a 100644
--- a/Frame.lua
+++ b/Frame.lua
@@ -144,7 +144,7 @@ StaticPopupDialogs["ARL_SEARCHFILTERED"] = {
 -------------------------------------------------------------------------------
 -- Variables
 -------------------------------------------------------------------------------
-local FilterValueMap		-- Assigned in addon:InitializeFrame()
+local FilterValueMap		-- Assigned in InitializeFrame()

 -------------------------------------------------------------------------------
 -- Upvalues
@@ -3919,7 +3919,7 @@ end
 -------------------------------------------------------------------------------
 -- Initializes runtime elements of MainPanel.
 -------------------------------------------------------------------------------
-function addon:InitializeFrame()
+local function InitializeFrame()
 	-------------------------------------------------------------------------------
 	-- Check to see if we're Horde or Alliance, and change the displayed
 	-- reputation strings to be faction-correct.
@@ -4392,9 +4392,13 @@ function addon:InitializeFrame()
 end

 -------------------------------------------------------------------------------
--- Displays the main recipe frame.
+-- Displays the main GUI frame.
 -------------------------------------------------------------------------------
 function MainPanel:Display(is_linked)
+	if InitializeFrame then
+		InitializeFrame()
+		InitializeFrame = nil
+	end
 	self:SetPosition()
 	self:SetProfession()
 	self:SetScale(addon.db.profile.frameopts.uiscale)