---

yaml --- r: 60923 b: refs/heads/master c: b6e8f00 h: refs/heads/master i: 60921: e4d2ee0 60919: a53ec9d v: v3
git-mirror · Jul 17, 2007 · ca8f1db · ca8f1db
1 parent e287647
commit ca8f1db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d
+refs/heads/master: b6e8f00fcd56b426371334d722d1f3fb251b7290
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
@@ -3506,20 +3506,22 @@ void do_blank_screen(int entering_gfx)
 		}
 		return;
 	}
-	if (blank_state != blank_normal_wait)
-		return;
-	blank_state = blank_off;
 
 	/* entering graphics mode? */
 	if (entering_gfx) {
 		hide_cursor(vc);
 		save_screen(vc);
 		vc->vc_sw->con_blank(vc, -1, 1);
 		console_blanked = fg_console + 1;
+		blank_state = blank_off;
 		set_origin(vc);
 		return;
 	}
 
+	if (blank_state != blank_normal_wait)
+		return;
+	blank_state = blank_off;
+
 	/* don't blank graphics */
 	if (vc->vc_mode != KD_TEXT) {
 		console_blanked = fg_console + 1;