Merge branch 'handle-failure-before-display-registration' into 'master'

display: Handle failure before display registration

See merge request GNOME/gdm!145

1 files changed, 3 insertions, 5 deletions

diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 7c954ad2..3a260923 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -675,8 +675,6 @@ gdm_display_unmanage (GdmDisplay *self)
 
         priv = gdm_display_get_instance_private (self);
 
-        g_debug ("GdmDisplay: unmanage display");
-
         gdm_display_disconnect (self);
 
         if (priv->user_access_file != NULL) {
@@ -1473,9 +1471,9 @@ static void
 self_destruct (GdmDisplay *self)
 {
         g_object_ref (self);
-        if (gdm_display_get_status (self) == GDM_DISPLAY_MANAGED) {
-                gdm_display_unmanage (self);
-        }
+
+        g_debug ("GdmDisplay: initiating display self-destruct");
+        gdm_display_unmanage (self);
 
         if (gdm_display_get_status (self) != GDM_DISPLAY_FINISHED) {
                 queue_finish (self);