mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tty: Fix order of VT ack/release ioctls and the vt handler 

We can only set up once we've acquired the VT and we shouldn't release the
VT until we've cleaned up.  Before we would release the VT first, and then
race to drop drm master as X tried to get drm master.  Which would kill X.
This commit is contained in:
Kristian Høgsberg 2012-01-16 10:57:14 -05:00
parent 23a47a80e2
commit 353e57f908
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tty.c
View File

@ -49,10 +49,10 @@ static int on_enter_vt(int signal_number, void *data)
{
struct tty *tty = data;
tty->vt_func(tty->compositor, TTY_ENTER_VT);
ioctl(tty->fd, VT_RELDISP, VT_ACKACQ);
tty->vt_func(tty->compositor, TTY_ENTER_VT);
return 1;
}
@ -61,10 +61,10 @@ on_leave_vt(int signal_number, void *data)
{
struct tty *tty = data;
ioctl(tty->fd, VT_RELDISP, 1);
tty->vt_func(tty->compositor, TTY_LEAVE_VT);
ioctl(tty->fd, VT_RELDISP, 1);
return 1;
}