From 5607e8e3934899393870ebcceb1f9e84651a840b Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 7 Mar 2024 09:08:15 -0800
Subject: [PATCH] Menus: reset options menu header position from shortcuts in
 Match Race and Host menus

- Match Race, Y button
- Host, Gameplay Options and Server Options
---
 src/menus/options-1.c                  | 5 +++++
 src/menus/play-local-race-difficulty.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/menus/options-1.c b/src/menus/options-1.c
index d369e1084..34d91e4e1 100644
--- a/src/menus/options-1.c
+++ b/src/menus/options-1.c
@@ -212,6 +212,11 @@ static void M_OptionsMenuGoto(menu_t *assignment)
 {
 	assignment->prevMenu = currentMenu;
 	M_SetupNextMenu(assignment, false);
+	if (currentMenu != &OPTIONS_MainDef)
+	{
+		optionsmenu.ticker = 0;
+		M_OptionsTick();
+	}
 }
 
 void M_VideoOptions(INT32 choice)
diff --git a/src/menus/play-local-race-difficulty.c b/src/menus/play-local-race-difficulty.c
index 26feabfd1..e8874c8e3 100644
--- a/src/menus/play-local-race-difficulty.c
+++ b/src/menus/play-local-race-difficulty.c
@@ -52,6 +52,8 @@ static void tick_routine(void)
 	{
 		case drace_mritems:
 			M_SetupNextMenu(&OPTIONS_GameplayItemsDef, false);
+			optionsmenu.ticker = 0;
+			M_OptionsTick();
 			break;
 
 		case drace_encore: