From 9f04fa3babaaabe0ed5bf4aa2563755bc6c45723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 3 Aug 2016 10:19:19 +0900 Subject: [PATCH] present: Make present_restore_screen_pixmap handle screen->root == NULL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Easier than dealing with it in all paths that can end up here during server shutdown. Signed-off-by: Michel Dänzer Reviewed-by: Hans de Goede --- present/present.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/present/present.c b/present/present.c index 5fde84626..8d37395fc 100644 --- a/present/present.c +++ b/present/present.c @@ -439,7 +439,7 @@ present_restore_screen_pixmap(ScreenPtr screen) * Only do this the first time for a particular unflip operation, or * we'll probably scribble over other windows */ - if (screen->GetWindowPixmap(screen->root) == flip_pixmap) + if (screen->root && screen->GetWindowPixmap(screen->root) == flip_pixmap) present_copy_region(&screen_pixmap->drawable, flip_pixmap, NULL, 0, 0); /* Switch back to using the screen pixmap now to avoid @@ -447,7 +447,8 @@ present_restore_screen_pixmap(ScreenPtr screen) */ if (flip_window) present_set_tree_pixmap(flip_window, flip_pixmap, screen_pixmap); - present_set_tree_pixmap(screen->root, NULL, screen_pixmap); + if (screen->root) + present_set_tree_pixmap(screen->root, NULL, screen_pixmap); } static void