From f3e64f181d6df7e18ffc33074f1d09ca4bb0ccde Mon Sep 17 00:00:00 2001 From: Thomas Thurman Date: Thu, 27 Mar 2008 12:32:50 +0000 Subject: [PATCH] fix regression where Metacity sometimes wouldn't quit when replaced 2008-03-27 Thomas Thurman * src/core/display.c (meta_display_close): fix regression where Metacity sometimes wouldn't quit when replaced svn path=/trunk/; revision=3665 --- ChangeLog | 5 +++++ src/core/display.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4117b287a..a3103c21f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-27 Thomas Thurman + + * src/core/display.c (meta_display_close): fix regression + where Metacity sometimes wouldn't quit when replaced + 2008-03-26 Thomas Thurman * src/core/display.c (event_callback): meta_display_screen_for_root diff --git a/src/core/display.c b/src/core/display.c index 40c3c9839..6e0154b7a 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1050,11 +1050,9 @@ meta_display_close (MetaDisplay *display, g_assert (display != NULL); - if (display->screens == NULL) + if (display->closing != 0) { - /* The display's already been closed. (We automatically - * close displays with no screens. - */ + /* The display's already been closed. */ return; }