From 9c91dd03da5492c2ec4a8eab2aecdd0b8f2fbca9 Mon Sep 17 00:00:00 2001
From: luigi budd <4997-luigi-budd@users.noreply.git.do.srb2.org>
Date: Fri, 27 Jun 2025 21:16:11 +0000
Subject: [PATCH 1/2] port from github ringracers-edit lul

---
 src/k_menu.h                        |  2 ++
 src/k_menufunc.c                    |  8 ++++++++
 src/menus/options-profiles-edit-1.c | 12 +++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/k_menu.h b/src/k_menu.h
index 9fec6b6ba..5567d3825 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -1167,6 +1167,8 @@ void M_MapProfileControl(event_t *ev);
 void M_ProfileTryController(INT32 choice);
 void M_ProfileControlsConfirm(INT32 choice);
 
+boolean M_ProfileQuitHandle(void);
+
 // video modes menu (resolution)
 void M_HandleVideoModes(INT32 ch);
 
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 0e3b1385d..9545b79a3 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -932,6 +932,14 @@ void M_ClearMenus(boolean callexitmenufunc)
 		D_StartTitle();
 	}
 
+	// this is not a good place to put this i thinkMore actions
+	if (optionsmenu.profile)
+	{
+		M_ResetOptions();
+		optionsmenu.profile = NULL;
+	}
+
+	
 	M_AbortVirtualKeyboard();
 	menumessage.active = false;
 
diff --git a/src/menus/options-profiles-edit-1.c b/src/menus/options-profiles-edit-1.c
index be805aa36..96d167dcf 100644
--- a/src/menus/options-profiles-edit-1.c
+++ b/src/menus/options-profiles-edit-1.c
@@ -52,7 +52,7 @@ menu_t OPTIONS_EditProfileDef = {
 	M_DrawOptionsCogs,
 	M_HandleProfileEdit,
 	NULL,
-	NULL,
+	M_ProfileQuitHandle,
 	M_ProfileEditInputs,
 };
 
@@ -238,3 +238,13 @@ void M_ProfileDeviceSelect(INT32 choice)
 
 	M_SetupNextMenu(&OPTIONS_ProfileControlsDef, false);	// Don't set device here anymore.
 }
+
+boolean M_ProfileQuitHandle(void)
+{
+	if (optionsmenu.profile != NULL)
+	{
+		M_ResetOptions();			// Reset all options variables otherwise things are gonna go reaaal bad lol.
+		optionsmenu.profile = NULL;	// Make sure to get rid of that, too.
+	}
+	return false;
+}
\ No newline at end of file

From 5d9dcd02430c354791efdb8d812d6a01070003da Mon Sep 17 00:00:00 2001
From: luigi budd <4997-luigi-budd@users.noreply.git.do.srb2.org>
Date: Mon, 14 Jul 2025 22:55:22 +0000
Subject: [PATCH 2/2] Properly fix the spb-profile stat grid bug

---
 src/k_menu.h                        |  2 --
 src/k_menufunc.c                    |  8 --------
 src/menus/options-profiles-edit-1.c | 12 +-----------
 src/menus/transient/pause-replay.c  |  4 ++++
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/k_menu.h b/src/k_menu.h
index 5567d3825..9fec6b6ba 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -1167,8 +1167,6 @@ void M_MapProfileControl(event_t *ev);
 void M_ProfileTryController(INT32 choice);
 void M_ProfileControlsConfirm(INT32 choice);
 
-boolean M_ProfileQuitHandle(void);
-
 // video modes menu (resolution)
 void M_HandleVideoModes(INT32 ch);
 
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 9545b79a3..0e3b1385d 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -932,14 +932,6 @@ void M_ClearMenus(boolean callexitmenufunc)
 		D_StartTitle();
 	}
 
-	// this is not a good place to put this i thinkMore actions
-	if (optionsmenu.profile)
-	{
-		M_ResetOptions();
-		optionsmenu.profile = NULL;
-	}
-
-	
 	M_AbortVirtualKeyboard();
 	menumessage.active = false;
 
diff --git a/src/menus/options-profiles-edit-1.c b/src/menus/options-profiles-edit-1.c
index 96d167dcf..be805aa36 100644
--- a/src/menus/options-profiles-edit-1.c
+++ b/src/menus/options-profiles-edit-1.c
@@ -52,7 +52,7 @@ menu_t OPTIONS_EditProfileDef = {
 	M_DrawOptionsCogs,
 	M_HandleProfileEdit,
 	NULL,
-	M_ProfileQuitHandle,
+	NULL,
 	M_ProfileEditInputs,
 };
 
@@ -238,13 +238,3 @@ void M_ProfileDeviceSelect(INT32 choice)
 
 	M_SetupNextMenu(&OPTIONS_ProfileControlsDef, false);	// Don't set device here anymore.
 }
-
-boolean M_ProfileQuitHandle(void)
-{
-	if (optionsmenu.profile != NULL)
-	{
-		M_ResetOptions();			// Reset all options variables otherwise things are gonna go reaaal bad lol.
-		optionsmenu.profile = NULL;	// Make sure to get rid of that, too.
-	}
-	return false;
-}
\ No newline at end of file
diff --git a/src/menus/transient/pause-replay.c b/src/menus/transient/pause-replay.c
index 864344d91..f0ea1ca9d 100644
--- a/src/menus/transient/pause-replay.c
+++ b/src/menus/transient/pause-replay.c
@@ -137,6 +137,10 @@ void M_EndModeAttackRun(void)
 	// Return to the menu.
 	D_ClearState();
 	M_StartControlPanel();
+	// This removes any lingering optionsmenu.profile pointers,
+	// so that when returning to char select, it will show the normal
+	// stat grid instead of the profile one (this is also most likely a bad way to fix this)
+	M_ResetOptions();
 }
 
 // Replay Playback Menu