summaryrefslogtreecommitdiff
path: root/sys/dev/wscons/wsdisplay.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/wscons/wsdisplay.c')
-rw-r--r--sys/dev/wscons/wsdisplay.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index f8cc5532367..e327bdaf6ab 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.45 2002/05/05 17:16:39 matthieu Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.46 2002/06/08 02:43:56 drahn Exp $ */
/* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */
/*
@@ -1093,8 +1093,16 @@ wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p)
* X-Window is starting
*/
wsmoused_release(sc);
+
+ /* disable the burner while X is running */
+ if (sc->sc_burnout)
+ timeout_del(&sc->sc_burner);
}
else {
+ /* reenable the burner after exiting from X */
+ if (sc->sc_burnout)
+ timeout_add(&sc->sc_burner, sc->sc_burnout);
+
/*
* wsmoused cohabitation with X-Window support
* X-Window is ending