summaryrefslogtreecommitdiff
path: root/tests/server
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-11-29 12:19:18 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-12-03 14:17:10 +1000
commitbb65c44617dc6a0d69591c66b37b4a8dd57af04d (patch)
tree5af91509687e09c4171eceb4786ee2bbecaa3d4d /tests/server
parente31b016a51b39b576ad80594ba3963a6302e3cdd (diff)
server/multihead: XSynchronize after checking dpy for non-NULL
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'tests/server')
-rw-r--r--tests/server/multihead.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/server/multihead.cpp b/tests/server/multihead.cpp
index a4bc5f3..f1f5ad3 100644
--- a/tests/server/multihead.cpp
+++ b/tests/server/multihead.cpp
@@ -285,15 +285,15 @@ TEST_P(ZaphodTest, ScreenCrossingButtons)
}
::Display *ldpy = XOpenDisplay(ldisplay.c_str());
- XSynchronize(ldpy, True);
ASSERT_TRUE(ldpy);
ASSERT_EQ(ScreenCount(ldpy), 2);
+ XSynchronize(ldpy, True);
/* we keep two separate connections to make the code a bit simpler */
::Display *rdpy = XOpenDisplay(rdisplay.c_str());
- XSynchronize(rdpy, True);
ASSERT_TRUE(rdpy);
ASSERT_EQ(ScreenCount(rdpy), 2);
+ XSynchronize(rdpy, True);
int width = DisplayWidth(ldpy, DefaultScreen(ldpy));
int height = DisplayHeight(ldpy, DefaultScreen(ldpy));