From 0924ac014d7caadab0b15ba69cd0a09cfe8a01da Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Tue, 26 Jul 2016 17:28:33 +0900 Subject: present: Only call restore_screen_pixmap once from set_abort_flip present_restore_screen_pixmap's work doesn't need to be done several times for the same pending flip. Fixes a crash if the X server quits while a flip is pending, in which case present_set_abort_flip may be called several times, including when screen->root is already cleared to NULL. Reviewed-by: Hans de Goede --- present/present.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/present/present.c b/present/present.c index 521083287..5fde84626 100644 --- a/present/present.c +++ b/present/present.c @@ -455,9 +455,10 @@ present_set_abort_flip(ScreenPtr screen) { present_screen_priv_ptr screen_priv = present_screen_priv(screen); - present_restore_screen_pixmap(screen); - - screen_priv->flip_pending->abort_flip = TRUE; + if (!screen_priv->flip_pending->abort_flip) { + present_restore_screen_pixmap(screen); + screen_priv->flip_pending->abort_flip = TRUE; + } } static void -- cgit v1.2.3