diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-03-27 12:32:50 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-03-27 12:32:50 +0000 |
| commit | f3e64f181d6df7e18ffc33074f1d09ca4bb0ccde (patch) | |
| tree | ce09db70b993c147278b227c08505f1a107919f0 | |
| parent | 0130c0d5b608a79f5d872d252c3b8aef817450d6 (diff) | |
| download | metacity-f3e64f181d6df7e18ffc33074f1d09ca4bb0ccde.tar.gz | |
fix regression where Metacity sometimes wouldn't quit when replaced
2008-03-27 Thomas Thurman <tthurman@gnome.org>
* src/core/display.c (meta_display_close): fix regression
where Metacity sometimes wouldn't quit when replaced
svn path=/trunk/; revision=3665
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/core/display.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2008-03-27 Thomas Thurman <tthurman@gnome.org> + + * src/core/display.c (meta_display_close): fix regression + where Metacity sometimes wouldn't quit when replaced + 2008-03-26 Thomas Thurman <tthurman@gnome.org> * src/core/display.c (event_callback): meta_display_screen_for_root diff --git a/src/core/display.c b/src/core/display.c index 40c3c983..6e0154b7 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; } |