From 38ea5c3d90bbc0034e59770fac8f3aa2c761c034 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Mon, 3 Oct 1994 01:22:46 +0000
Subject: [PATCH] Fix 'cursor-disappearce-after-switching-screen-from-X' bug

---
 sys/dev/syscons/syscons.c | 4 ++--
 sys/i386/isa/syscons.c    | 4 ++--
 sys/isa/syscons.c         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 6bdf180e42f0..15cccf8396bf 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.62 1994/10/02 14:08:57 ache Exp $
+ *	$Id: syscons.c,v 1.63 1994/10/02 17:41:42 phk Exp $
  */
 
 #include "sc.h"
@@ -1458,7 +1458,7 @@ exchange_scr(void)
 	old_scp->crt_base = old_scp->scr_buf;
 	move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
 	cur_console = new_scp;
-	if (old_scp->mode != new_scp->mode)
+	if (old_scp->mode != new_scp->mode || (old_scp->status & UNKNOWN_MODE))
 		set_mode(new_scp);
 	new_scp->crt_base = Crtat;
 	move_crsr(new_scp, new_scp->xpos, new_scp->ypos);
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 6bdf180e42f0..15cccf8396bf 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.62 1994/10/02 14:08:57 ache Exp $
+ *	$Id: syscons.c,v 1.63 1994/10/02 17:41:42 phk Exp $
  */
 
 #include "sc.h"
@@ -1458,7 +1458,7 @@ exchange_scr(void)
 	old_scp->crt_base = old_scp->scr_buf;
 	move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
 	cur_console = new_scp;
-	if (old_scp->mode != new_scp->mode)
+	if (old_scp->mode != new_scp->mode || (old_scp->status & UNKNOWN_MODE))
 		set_mode(new_scp);
 	new_scp->crt_base = Crtat;
 	move_crsr(new_scp, new_scp->xpos, new_scp->ypos);
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 6bdf180e42f0..15cccf8396bf 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.62 1994/10/02 14:08:57 ache Exp $
+ *	$Id: syscons.c,v 1.63 1994/10/02 17:41:42 phk Exp $
  */
 
 #include "sc.h"
@@ -1458,7 +1458,7 @@ exchange_scr(void)
 	old_scp->crt_base = old_scp->scr_buf;
 	move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
 	cur_console = new_scp;
-	if (old_scp->mode != new_scp->mode)
+	if (old_scp->mode != new_scp->mode || (old_scp->status & UNKNOWN_MODE))
 		set_mode(new_scp);
 	new_scp->crt_base = Crtat;
 	move_crsr(new_scp, new_scp->xpos, new_scp->ypos);