summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <halfline@gmail.com>2018-10-06 09:24:02 +0000
committerRay Strode <halfline@gmail.com>2018-10-06 09:24:02 +0000
commitb569c1ef3fcb62292b7d66b950757a471dace3eb (patch)
tree82e1b2daa544039bf37548b7774e66566fc7e422
parent9e532ea4b400914704e063d81d21c73c9b84c048 (diff)
parenta3904bf5f9e6fe6bc3bb2ad9c856cf1361b8194d (diff)
downloadgdm-b569c1ef3fcb62292b7d66b950757a471dace3eb.tar.gz
Merge branch 'wip/fix-autologin' into 'master'
manager: correct display confusion Closes #426 See merge request GNOME/gdm!49
-rw-r--r--daemon/gdm-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index b1e9b68b..62a96738 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -1689,8 +1689,8 @@ on_start_user_session (StartUserSessionOperation *operation)
gdm_display_store_remove (self->priv->display_store, display);
g_object_unref (display);
- self->priv->automatic_login_display = g_object_get_data (G_OBJECT (operation->session), "gdm-display");
- g_object_add_weak_pointer (G_OBJECT (display), (gpointer *) &self->priv->automatic_login_display);
+ self->priv->automatic_login_display = g_object_get_data (G_OBJECT (operation->session), "gdm-display");
+ g_object_add_weak_pointer (G_OBJECT (self->priv->automatic_login_display), (gpointer *) &self->priv->automatic_login_display);
}
}