# HG changeset patch
# User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
# Date 1366853471 0
# Node ID ea423ee3a8c166bf4ee4fc1b45af3cafce681714
# Parent  e8a004a4177b57fa0517d908da2b579d415a27e6
Don't preload the macro frame, test for it when necessary.

diff -r e8a004a4177b -r ea423ee3a8c1 CallbackFactory.lua
--- a/CallbackFactory.lua	Thu Apr 25 01:31:06 2013 +0000
+++ b/CallbackFactory.lua	Thu Apr 25 01:31:11 2013 +0000
@@ -67,7 +67,7 @@
 end
 
 function callbacks.Macros()
-	if MacroFrame:IsShown() and MacroFrame:IsVisible() then
+	if MacroFrame and MacroFrame:IsShown() and MacroFrame:IsVisible() then
 		HideUIPanel(MacroFrame)
 	else
 		ShowMacroFrame()
diff -r e8a004a4177b -r ea423ee3a8c1 CyborgMMO7.lua
--- a/CyborgMMO7.lua	Thu Apr 25 01:31:06 2013 +0000
+++ b/CyborgMMO7.lua	Thu Apr 25 01:31:11 2013 +0000
@@ -115,10 +115,6 @@
 		CyborgMMO_RatPageModel:LoadData()
 		BindingsLoaded = true
 
-		ShowMacroFrame()
-		HideUIPanel(MacroFrame)
-
-
 		CyborgMMO_SetupModeCallbacks(1)
 		CyborgMMO_SetupModeCallbacks(2)
 		CyborgMMO_SetupModeCallbacks(3)