From 2d98b3f9eb4afc7426e155b10d717922c54c58b3 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 17 Feb 2020 16:37:13 -0800
Subject: [PATCH 1/3] Revert "Revert "Let the console open in menus""

This reverts commit 73368b0c9a12a581bcc78521adaf219315de6009.
---
 src/console.c | 11 +----------
 src/d_main.c  | 15 +++++++--------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/console.c b/src/console.c
index 59d2b3e6c..8746bf036 100644
--- a/src/console.c
+++ b/src/console.c
@@ -613,15 +613,6 @@ void CON_Ticker(void)
 	con_tick++;
 	con_tick &= 7;
 
-	// if the menu is open then close the console.
-	if (menuactive && con_destlines)
-	{
-		consoletoggle = false;
-		con_destlines = 0;
-		CON_ClearHUD();
-		I_UpdateMouseGrab();
-	}
-
 	// console key was pushed
 	if (consoletoggle)
 	{
@@ -793,7 +784,7 @@ boolean CON_Responder(event_t *ev)
 		// check other keys only if console prompt is active
 		if (!consoleready && key < NUMINPUTS) // metzgermeister: boundary check!!
 		{
-			if (bindtable[key])
+			if (! menuactive && bindtable[key])
 			{
 				COM_BufAddText(bindtable[key]);
 				COM_BufAddText("\n");
diff --git a/src/d_main.c b/src/d_main.c
index 2ff0042fd..149fb3071 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -188,14 +188,14 @@ void D_ProcessEvents(void)
 				continue;
 		}
 
-		// Menu input
-		if (M_Responder(ev))
-			continue; // menu ate the event
-
 		// console input
 		if (CON_Responder(ev))
 			continue; // ate the event
 
+		// Menu input
+		if (M_Responder(ev))
+			continue; // menu ate the event
+
 		G_Responder(ev);
 	}
 }
@@ -502,13 +502,12 @@ static void D_Display(void)
 	// vid size change is now finished if it was on...
 	vid.recalc = 0;
 
-	// FIXME: draw either console or menu, not the two
-	if (gamestate != GS_TIMEATTACK)
-		CON_Drawer();
-
 	M_Drawer(); // menu is drawn even on top of everything
 	// focus lost moved to M_Drawer
 
+	if (gamestate != GS_TIMEATTACK)
+		CON_Drawer();
+
 	//
 	// wipe update
 	//

From c77e444df97d5d78f650db3a78507bd9bc9d4af9 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 15 Feb 2020 17:08:07 -0800
Subject: [PATCH 2/3] Draw console in the Record/NiGHTS Attack menus

(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
---
 src/d_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 149fb3071..6b5164894 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -505,8 +505,7 @@ static void D_Display(void)
 	M_Drawer(); // menu is drawn even on top of everything
 	// focus lost moved to M_Drawer
 
-	if (gamestate != GS_TIMEATTACK)
-		CON_Drawer();
+	CON_Drawer();
 
 	//
 	// wipe update

From b9c2cab265a838390815abfa1f000314c852ab20 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 17 Feb 2020 17:10:29 -0800
Subject: [PATCH 3/3] Don't let console open with menu keys while the menu is
 open

---
 src/d_main.c | 8 ++++----
 src/m_menu.c | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 6b5164894..cff6b8805 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -188,14 +188,14 @@ void D_ProcessEvents(void)
 				continue;
 		}
 
-		// console input
-		if (CON_Responder(ev))
-			continue; // ate the event
-
 		// Menu input
 		if (M_Responder(ev))
 			continue; // menu ate the event
 
+		// console input
+		if (CON_Responder(ev))
+			continue; // ate the event
+
 		G_Responder(ev);
 	}
 }
diff --git a/src/m_menu.c b/src/m_menu.c
index dbe5d854f..687f87051 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3150,6 +3150,9 @@ boolean M_Responder(event_t *ev)
 	if (gamestate == GS_TITLESCREEN && finalecount < TICRATE)
 		return false;
 
+	if (CON_Ready())
+		return false;
+
 	if (noFurtherInput)
 	{
 		// Ignore input after enter/escape/other buttons
@@ -3509,6 +3512,7 @@ boolean M_Responder(event_t *ev)
 			return false;
 
 		default:
+			CON_Responder(ev);
 			break;
 	}