Quantcast

Reordered the window opening sequence to address the situation where some systems have both windows open and visible at the same time.

pschifferer [10-31-09 - 14:22]
Reordered the window opening sequence to address the situation where some systems have both windows open and visible at the same time.
Filename
CauldronMainUI.lua
diff --git a/CauldronMainUI.lua b/CauldronMainUI.lua
index 8036528..49b8ded 100644
--- a/CauldronMainUI.lua
+++ b/CauldronMainUI.lua
@@ -18,12 +18,6 @@ function Cauldron:Frame_Show()
 		--@end-alpha@
  		CloseDropDownMenus();

-		--@alpha@
-	 	self:debug("Frame_Show: show our frame");
-		--@end-alpha@
- 		ShowUIPanel(CauldronFrame);
--- 		tinsert(UISpecialFrames, CauldronFrame:GetName());
-
 		if TradeSkillFrame then
 			-- place our frame over the original frame
 --			CauldronFrame:SetPoint("TOPLEFT", TradeSkillFrame:GetLeft(), TradeSkillFrame:GetTop());
@@ -33,8 +27,12 @@ function Cauldron:Frame_Show()
 			--@end-alpha@

 			-- hide the original tradeskill frame
-			Cauldron.vars.origFrameStrata = TradeSkillFrame:GetFrameStrata();
-			Cauldron.vars.origFrameLevel = TradeSkillFrame:GetFrameLevel();
+			if not Cauldron.vars.origFrameStrata then
+				Cauldron.vars.origFrameStrata = TradeSkillFrame:GetFrameStrata();
+			end
+			if not Cauldron.vars.origFrameLevel then
+				Cauldron.vars.origFrameLevel = TradeSkillFrame:GetFrameLevel();
+			end

 			TradeSkillFrame:SetAlpha(0);
 			TradeSkillFrame:ClearAllPoints();
@@ -55,6 +53,12 @@ function Cauldron:Frame_Show()

 		end

+		--@alpha@
+	 	self:debug("Frame_Show: show our frame");
+		--@end-alpha@
+ 		ShowUIPanel(CauldronFrame);
+-- 		tinsert(UISpecialFrames, CauldronFrame:GetName());
+
 	 	self:RegisterMessage("Cauldron_Update", "OnCauldronUpdate");

 		--@alpha@