summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-02-25 16:33:18 -0500
committerRay Strode <rstrode@redhat.com>2015-03-25 15:24:22 -0400
commit0194872467764220c838385432b15b280ffa7ddf (patch)
tree47c57c693111519889769111733c9d8241479ec8
parent0f9b09493ea7f5fa555e364a7e6fd3b613b9c53c (diff)
downloadgdm-0194872467764220c838385432b15b280ffa7ddf.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 9c409dc3..f060135a 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -2292,10 +2292,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);
}