summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-02-17 13:44:12 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-02-22 21:15:10 -0800
commitcb6a32da27f09261c4d561c19d1877c750d98cc3 (patch)
tree1dc8c1c70a152594e03ce2ef0802958cc1d12873
parent1562c4a1ca748d2c4a8c69d57ba09ff7ca9cc453 (diff)
XQuartz: Short-circuit activateX:
This also avoids a deadlock when calling activateX: before the server thread has initialized Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--hw/xquartz/X11Application.m3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 5b38eae32..048e7875b 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -191,6 +191,9 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
}
- (void) activateX:(OSX_BOOL)state {
+ if (_x_active == state)
+ return;
+
DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
if (state) {
if(bgMouseLocationUpdated) {