[gdm/gnome-3-14] manager: finish displays even if they're unmanaged

[Ray Strode <halfline src gnome org>]

commit 0194872467764220c838385432b15b280ffa7ddf
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 9c409dc..f060135 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);
 }