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

seat: fix calling parent-callbacks on forced sleeping

Browse Source 
If we force a seat to go asleep, we should _always_ notify the parent
about this. Otherwise, we might get unexpected results.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-11-19 13:12:10 +01:00
parent 080ecfd637
commit caf4178803
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kmscon_seat.c
View File

@ -177,7 +177,7 @@ static int seat_go_background(struct kmscon_seat *seat, bool force)
static int seat_go_asleep(struct kmscon_seat *seat, bool force)
{
int ret = 0;
int ret, err = 0;
if (!seat->awake)
return 0;
@ -185,25 +185,26 @@ static int seat_go_asleep(struct kmscon_seat *seat, bool force)
if (force) {
seat->foreground = false;
seat->current_sess = NULL;
ret = -EBUSY;
err = -EBUSY;
} else {
return -EBUSY;
}
}
if (!ret && seat->cb) {
if (seat->cb) {
ret = seat->cb(seat, KMSCON_SEAT_SLEEP, seat->data);
if (ret) {
log_warning("cannot put seat %s asleep: %d",
seat->name, ret);
return ret;
if (!force)
return ret;
}
}
seat->awake = false;
uterm_input_sleep(seat->input);
return ret;
return err;
}
static void activate_display(struct kmscon_display *d)