diff options
author | Ray Strode <halfline@gmail.com> | 2021-07-22 16:51:39 +0000 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2021-07-22 16:51:39 +0000 |
commit | f66ff435ab9951c783ff17e16ade0a800cec5497 (patch) | |
tree | f9ab245ec63639787fc68bff074f08963cc79a48 /daemon/gdm-display.c | |
parent | b0c8d4e670a92d89d946d5d0b6f25a004d78efae (diff) | |
parent | 2e7636d431fff0b3a808184c086a60e2c136c1a1 (diff) | |
download | gdm-f66ff435ab9951c783ff17e16ade0a800cec5497.tar.gz |
Merge branch 'handle-failure-before-display-registration' into 'master'
display: Handle failure before display registration
See merge request GNOME/gdm!145
Diffstat (limited to 'daemon/gdm-display.c')
-rw-r--r-- | daemon/gdm-display.c | 8 |
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); |