summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-02-25 16:33:18 -0500
committerRay Strode <rstrode@redhat.com>2015-02-25 16:33:18 -0500
commitd80054c8452d52a69416a85960087511b1886c49 (patch)
tree0d794e171a5090440b7b827869cc217125ba135f
parenta169b4df3dba32719a276a93e0ae1663698e915b (diff)
downloadgdm-d80054c8452d52a69416a85960087511b1886c49.tar.gz
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.
-rw-r--r--daemon/gdm-manager.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 77546b67..14085827 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);
}