diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-03-19 14:07:35 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-03-19 15:53:03 -0400 |
| commit | 7ae2c9cd92adb41e4bdeac1fc1d4832b81a718bd (patch) | |
| tree | feae807a15f645a7d93a31023a7e33ed49fc5288 /utils | |
| parent | 932c65c66d26915b40830a91762ae10ca95458a2 (diff) | |
| download | gdm-7ae2c9cd92adb41e4bdeac1fc1d4832b81a718bd.tar.gz | |
user-switching: don't bail if login screen isn't running
It's okay if no login screen is running, we can just launch
one.
https://bugzilla.gnome.org/show_bug.cgi?id=655380
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gdmflexiserver.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c index 4e07413a..e4d8a324 100644 --- a/utils/gdmflexiserver.c +++ b/utils/gdmflexiserver.c @@ -819,6 +819,8 @@ goto_login_session_for_systemd (DBusConnection *connection, char *seat_id; ret = FALSE; + session_id = NULL; + seat_id = NULL; /* First look for any existing LoginWindow sessions on the seat. If none are found, create a new one. */ @@ -863,14 +865,7 @@ goto_login_session_for_systemd (DBusConnection *connection, } res = get_login_window_session_id_for_systemd (seat_id, &session_id); - if (! res) { - free (seat_id); - - g_set_error (error, GDM_FLEXISERVER_ERROR, 1, _("The system is unable to find a login screen to switch to.")); - return FALSE; - } - - if (session_id != NULL) { + if (res && session_id != NULL) { res = activate_session_id_for_systemd (connection, seat_id, session_id); if (res) { |