From d466d31196547f39064a32a0e0947c8238bae8a0 Mon Sep 17 00:00:00 2001
From: Ben Anderson <bashmaster@users.sourceforge.net>
Date: Sun, 13 Mar 2005 16:00:38 +0000
Subject: [PATCH] Fix one or two mistakes; allow mask setting even if no winow
 has been created yet.

---
 stepmania/src/archutils/Unix/X11Helper.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/archutils/Unix/X11Helper.cpp b/stepmania/src/archutils/Unix/X11Helper.cpp
index a7f5c42cee..5619a48233 100644
--- a/stepmania/src/archutils/Unix/X11Helper.cpp
+++ b/stepmania/src/archutils/Unix/X11Helper.cpp
@@ -10,7 +10,7 @@ vector<Callback_t>	pCBacks;	// Callbacks for the rendering
 					// thread
 list<long>		pMasks;		// Currently open masks
 Display			*pDpy;		// Running X connection
-Window			*pWin;		// Current window
+Window			*pWin	= NULL;	// Current window
 unsigned short int	pCt	= 0;	// Number of subsystems using
 					// the X connection
 
@@ -51,7 +51,14 @@ static bool pApplyMasks()
 bool X11Helper::OpenMask(long mask)
 {
 	pMasks.push_back(mask);
-	return pApplyMasks();
+	if(pWin != NULL)
+	{
+		return pApplyMasks();
+	}
+	else
+	{
+		return true;
+	}
 }
 
 bool X11Helper::CloseMask(long mask)
@@ -70,14 +77,21 @@ bool X11Helper::CloseMask(long mask)
 		if(i > pMasks.size()-1) { return false; }
 	}
 
-	return pApplyMasks();
+	if(pWin != NULL)
+	{
+		return pApplyMasks();
+	}
+	else
+	{
+		return true;
+	}
 }
 
 bool X11Helper::MakeWindow(int screenNum, int depth, Visual *visual int width=64, int height=64)
 {
 	int i;
 	
-	if(dpy == NULL) { return false; }
+	if(pDpy == NULL) { return false; }
 
 	XSetWindowAttributes winAttribs;