- Fail VT switching when the controlling program, such as the

X server, is not responding to the VT switching protocol. (This part
  of the code has been somewhat wrong in -CURRENT, but -STABLE has the
  correct code...)
This commit is contained in:
Kazutaka YOKOTA 1999-11-28 07:44:11 +00:00
parent c9d6883b93
commit 102adbe199
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=53816

View File

@ -2129,14 +2129,14 @@ switch_scr(sc_softc_t *sc, u_int next_scr)
case 4:
default:
/*
* Clear the flag and force the previous switch to finish,
* but return now with error.
* Act as if the controlling program returned
* VT_FALSE.
*/
DPRINTF(5, ("force reset WAIT_REL, "));
sc->cur_scp->status &= ~SWITCH_WAIT_REL;
s = do_switch_scr(sc, s);
sc->switch_in_progress = 0;
splx(s);
DPRINTF(5, ("force finishing previous switch\n"));
DPRINTF(5, ("act as if VT_FALSE was seen\n"));
return EINVAL;
}
} else if (sc->cur_scp->status & SWITCH_WAIT_ACQ) {