xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland-present.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3b4671f9e9c85f23e7593652e1482b11dc3ad4af
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Apr 19 09:13:23 2018 +0200

    xwayland: Clean up all frame callbacks
    
    Regardless of the order we un-realize windows.
    
    Suggested-by: Roman Gilg <subdiff at gmail.com>
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Roman Gilg <subdiff at gmail.com>

diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index e835a1399..c41a8a2d1 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -77,7 +77,7 @@ xwl_present_cleanup(struct xwl_window *xwl_window, WindowPtr window)
 {
     struct xwl_present_event *event, *tmp;
 
-    if (xwl_window->present_window == window) {
+    if (xwl_window->present_window == window || xwl_window->window == window) {
         if (xwl_window->present_frame_callback) {
             wl_callback_destroy(xwl_window->present_frame_callback);
             xwl_window->present_frame_callback = NULL;