From c520a46fa647c6215154ad2386a18d50163e11e0 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 26 Mar 2024 23:10:58 +0000
Subject: [PATCH] M_OptionsMenuGoto, related: Make newer submenus of Online
 Menu "inherit" their music from the supermenus

---
 src/menus/options-1.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/menus/options-1.c b/src/menus/options-1.c
index a4b60feba..b7037b900 100644
--- a/src/menus/options-1.c
+++ b/src/menus/options-1.c
@@ -211,6 +211,7 @@ void M_OptionsTick(void)
 static void M_OptionsMenuGoto(menu_t *assignment)
 {
 	assignment->prevMenu = currentMenu;
+	assignment->music = currentMenu->music;
 	M_SetupNextMenu(assignment, false);
 	if (currentMenu != &OPTIONS_MainDef)
 	{
@@ -236,6 +237,7 @@ void M_SoundOptions(INT32 choice)
 void M_GameplayOptions(INT32 choice)
 {
 	(void)choice;
+	OPTIONS_GameplayItemsDef.music = currentMenu->music;
 	M_OptionsMenuGoto(&OPTIONS_GameplayDef);
 	OPTIONS_MainDef.lastOn = mopt_gameplay;
 }
@@ -243,6 +245,7 @@ void M_GameplayOptions(INT32 choice)
 void M_ServerOptions(INT32 choice)
 {
 	(void)choice;
+	OPTIONS_ServerAdvancedDef.music = currentMenu->music;
 	M_OptionsMenuGoto(&OPTIONS_ServerDef);
 	OPTIONS_MainDef.lastOn = mopt_server;
 }