norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

seat: fix rescheduling sessions if none is active

Browse Source 
If no session is active, we must not choose the scheduled session as
start-place. Otherwise, we will not schedule any session because the
start-session isn't used in the iteration.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-12-02 15:24:13 +01:00
parent e74f0de0b6
commit ec9e1bf9a3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kmscon_seat.c
View File

@ -412,17 +412,16 @@ static void seat_next(struct kmscon_seat *seat)
if (seat->current_sess)
cur = &seat->current_sess->list;
else if (seat->scheduled_sess)
cur = &seat->scheduled_sess->list;
else if (seat->session_count)
cur = &seat->sessions;
else
return;
if (seat->current_sess)
next = NULL;
else
next = NULL;
if (!seat->current_sess && seat->dummy_sess &&
seat->dummy_sess->enabled)
next = seat->dummy_sess;
shl_dlist_for_each_but_one(iter, cur, &seat->sessions) {
s = shl_dlist_entry(iter, struct kmscon_session, list);
if (!s->enabled || seat->dummy_sess == s)
@ -446,17 +445,16 @@ static void seat_prev(struct kmscon_seat *seat)
if (seat->current_sess)
cur = &seat->current_sess->list;
else if (seat->scheduled_sess)
cur = &seat->scheduled_sess->list;
else if (seat->session_count)
cur = &seat->sessions;
else
return;
if (seat->current_sess)
prev = NULL;
else
prev = NULL;
if (!seat->current_sess && seat->dummy_sess &&
seat->dummy_sess->enabled)
prev = seat->dummy_sess;
shl_dlist_for_each_reverse_but_one(iter, cur, &seat->sessions) {
s = shl_dlist_entry(iter, struct kmscon_session, list);
if (!s->enabled || seat->dummy_sess == s)