From a9e5904d2f1984faf56435d27e8ed2f952eafb14 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 4 Nov 2022 00:30:03 +0000
Subject: [PATCH] Show (and clear) menu messages on the titlescreen

---
 src/f_finale.c   | 5 +++++
 src/k_menufunc.c | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/f_finale.c b/src/f_finale.c
index f95f0103d..33b758d8f 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2103,6 +2103,8 @@ luahook:
 		LUA_HookHUD(luahuddrawlist_title, HUD_HOOK(title));
 	}
 	LUA_HUD_DrawList(luahuddrawlist_title);
+
+	M_DrawMenuMessage();
 }
 
 // (no longer) De-Demo'd Title Screen
@@ -2114,6 +2116,9 @@ void F_TitleScreenTicker(boolean run)
 	{
 		finalecount++;
 
+		if (menumessage.fadetimer < 9)
+			menumessage.fadetimer++;
+
 		if (finalecount == 1)
 		{
 			// Now start the music
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 3079b164c..4babf145b 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -954,6 +954,8 @@ void M_StartControlPanel(void)
 
 	if (!Playing())
 	{
+		M_StopMessage(0); // Doesn't work with MM_YESNO or MM_EVENTHANDLER... but good enough to get the game as it is currently functional again
+
 		if (cv_currprofile.value == -1) // Only ask once per session.
 		{
 			// Make sure the profile data is ready now since we need to select a profile.
@@ -1875,11 +1877,8 @@ void M_HandleMenuMessage(void)
 	boolean btok = M_MenuConfirmPressed(pid);
 	boolean btnok = M_MenuBackPressed(pid);
 
-	menumessage.fadetimer++;
-
-	if (menumessage.fadetimer > 9)
-		menumessage.fadetimer = 9;
-
+	if (menumessage.fadetimer < 9)
+		menumessage.fadetimer++;
 
 	switch (menumessage.flags)
 	{