logind: make session type and class settable via the same ways

[elogind.git] / src / login / logind-session-dbus.c

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index f1905e93f36ba938f07f06f1729f675342827119..54ad827feb27a6711f4cf5d0fea5cfa28c57c769 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -647,13 +647,16 @@ int session_send_create_reply(Session *s, sd_bus_error *error) {
 
         assert(s);
 
-        /* This is called after the session scope was successfully
-         * created, and finishes where bus_manager_create_session()
-         * left off. */
+        /* This is called after the session scope and the user service
+         * were successfully created, and finishes where
+         * bus_manager_create_session() left off. */
 
         if (!s->create_message)
                 return 0;
 
+        if (!sd_bus_error_is_set(error) && (s->scope_job || s->user->service_job))
+                return 0;
+
         c = s->create_message;
         s->create_message = NULL;