Merge "x11: Fix deadlock" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)
framework/platform/X11/tcuX11.cpp

index c60c95e..d58ef63 100644 (file)
@@ -200,7 +200,7 @@ void Window::setVisibility (bool visible)
 
        do
        {
-               XNextEvent(dpy, &event);
+               XWindowEvent(dpy, m_window, ExposureMask | StructureNotifyMask, &event);
        } while (event.type != eventType);
 
        m_visible = visible;