When locking, start display server after connecting it to a session

[sojka/lightdm.git] / src / seat.c

diff --git a/src/seat.c b/src/seat.c
index 1596a3dac4f63df3262f2a0fc4fc5865f36c8552..39be5bebe0fa1f8df40b342fb6fb91227a361cf5 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -1382,8 +1382,6 @@ seat_switch_to_guest (Seat *seat, const gchar *session_name)
         return FALSE;
 
     display_server = create_display_server (seat, session_get_session_type (session));
-    if (!display_server_start (display_server))
-        return FALSE;
 
     if (seat->priv->session_to_activate)
         g_object_unref (seat->priv->session_to_activate);
@@ -1391,7 +1389,7 @@ seat_switch_to_guest (Seat *seat, const gchar *session_name)
     session_set_pam_service (session, AUTOLOGIN_SERVICE);
     session_set_display_server (session, display_server);
 
-    return TRUE;
+    return display_server_start (display_server);
 }
 
 gboolean
@@ -1421,8 +1419,6 @@ seat_lock (Seat *seat, const gchar *username)
         return FALSE;
 
     display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
-    if (!display_server_start (display_server))
-        return FALSE;
 
     if (seat->priv->session_to_activate)
         g_object_unref (seat->priv->session_to_activate);
@@ -1432,7 +1428,7 @@ seat_lock (Seat *seat, const gchar *username)
         greeter_set_hint (greeter_session, "select-user", username);
     session_set_display_server (SESSION (greeter_session), display_server);
 
-    return TRUE;
+    return display_server_start (display_server);
 }
 
 void