[gdm] manager: finish displays even if they're unmanaged
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] manager: finish displays even if they're unmanaged
- Date: Wed, 25 Feb 2015 21:34:32 +0000 (UTC)
commit d80054c8452d52a69416a85960087511b1886c49
Author: Ray Strode <rstrode redhat com>
Date: Wed Feb 25 16:33:18 2015 -0500
manager: finish displays even if they're unmanaged
Some displays may be PREPARED, but not yet MANAGED.
Those need to be finished at finalize time too.
Fixes an assertion failure crash in some cases.
daemon/gdm-manager.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 77546b6..1408582 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -2651,10 +2651,8 @@ finish_display (const char *id,
GdmDisplay *display,
GdmManager *manager)
{
- if (gdm_display_get_status (display) != GDM_DISPLAY_MANAGED)
- return;
-
- gdm_display_unmanage (display);
+ if (gdm_display_get_status (display) == GDM_DISPLAY_MANAGED)
+ gdm_display_unmanage (display);
gdm_display_finish (display);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]