summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2011-08-10 12:11:43 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2011-09-01 03:58:01 +0200
commit7e1c773325c6f18af7b135dc2ee2b799801c2f57 (patch)
treecee633cae80de56f09c32651d7f75ea9e5cef37d
parent6a718d9b0da0bbd0d90beefcd661039a474a4719 (diff)
fix bug #692833
-rw-r--r--client/x11/platform.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index f3fb4441..670912cb 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -84,7 +84,7 @@ static GLXFBConfig **fb_config = NULL;
static XIM x_input_method = NULL;
static XIC x_input_context = NULL;
-static Window platform_win;
+static Window platform_win = 0;
static XContext win_proc_context;
static ProcessLoop* main_loop = NULL;
static int focus_count = 0;
@@ -925,6 +925,9 @@ DynamicScreen::DynamicScreen(Display* display, int screen, int& next_mon_id)
, _saved_height (get_height())
, _out_of_sync (false)
{
+ if (platform_win != 0)
+ return;
+
X_DEBUG_SYNC(display);
//FIXME: replace RootWindow() in other refs as well?
XLockDisplay(display);
@@ -1229,6 +1232,9 @@ MultyMonScreen::MultyMonScreen(Display* display, int screen, int& next_mon_id)
throw;
}
+ if (platform_win != 0)
+ return;
+
XLockDisplay(display);
platform_win = XCreateSimpleWindow(display, RootWindow(display, screen), 0, 0, 1, 1, 0, 0, 0);
XUnlockDisplay(display);