Merge with trunk

1 files changed, 8 insertions, 0 deletions

diff --git a/src/seat.c b/src/seat.c
index ca1621b3..33b73152 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -1029,6 +1029,14 @@ create_user_session (Seat *seat, const gchar *username, gboolean autostart)
     session_name = user_get_xsession (user);
     language = user_get_language (user);
 
+    /* Override session for autologin if configured */
+    if (autostart)
+    {
+        const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session");
+        if (autologin_session_name)
+            session_name = autologin_session_name;
+    }
+
     if (!session_name)
         session_name = seat_get_string_property (seat, "user-session");
     sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");