summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-09-21 18:36:24 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-09-21 18:36:24 +0000
commite008596bbbcbd2a63812793a786973166d6d991e (patch)
treeeff1053aec09b4a0c45b71e50d92e7063912a3c9 /sys/dev
parentc7b0ec0117ef1702e6cda32e9c942b02e16f52e9 (diff)
Do not retrigger the screen blanker if one change its settings through
wsconsctl, while running X11.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/wscons/wsdisplay.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 4c0738a442f..79ef18629a8 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.53 2004/03/09 22:41:57 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.54 2004/09/21 18:36:23 miod Exp $ */
/* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */
/*
@@ -1176,7 +1176,8 @@ wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p)
if (!sc->sc_burnman) {
sc->sc_burnout = sc->sc_burnoutintvl;
/* reinit timeout if changed */
- wsdisplay_burn(sc, sc->sc_burnflags);
+ if ((scr->scr_flags & SCR_GRAPHICS) == 0)
+ wsdisplay_burn(sc, sc->sc_burnflags);
}
}
return (error);