Mercurial > wow > cyborg-mmo7

changeset 30:ea423ee3a8c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't preload the macro frame, test for it when necessary.
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:31:11 +0000
parents e8a004a4177b
children 183683794b91
files CallbackFactory.lua CyborgMMO7.lua
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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)