From 94446a38eb14dcf7ac21adc71f32ad176e16f0b0 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 6 Jul 2018 20:55:22 +0100
Subject: [PATCH] Improve the defaulting thing to not play the sound if the
 cvar isn't to be touched.

---
 src/m_menu.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index 543ff0c1e..7f9a5c10d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2195,21 +2195,14 @@ static void M_ChangeCvar(INT32 choice)
 
 	if (choice == -1)
 	{
-		if (cv == &cv_dummystaff
-			|| cv == &cv_nextmap
-			|| cv == &cv_newgametype)
-			return;
-		if (currentMenu == &SP_TimeAttackDef)
+		if (cv == &cv_playercolor)
 		{
-			if (cv == &cv_playercolor)
-			{
-				SINT8 skinno = R_SkinAvailable(cv_chooseskin.string);
-				if (skinno == -1)
-					return;
-				CV_SetValue(cv,skins[skinno].prefcolor);
-			}
-			return;
+			SINT8 skinno = R_SkinAvailable(cv_chooseskin.string);
+			if (skinno == -1)
+				return;
+			CV_SetValue(cv,skins[skinno].prefcolor);
 		}
+		return;
 		CV_Set(cv,cv->defaultvalue);
 		return;
 	}
@@ -2674,6 +2667,14 @@ boolean M_Responder(event_t *ev)
 			if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS
 				|| (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR))
 			{
+				consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
+
+				if (cv == &cv_chooseskin
+					|| cv == &cv_dummystaff
+					|| cv == &cv_nextmap
+					|| cv == &cv_newgametype)
+					return true;
+
 				if (currentMenu != &OP_SoundOptionsDef)
 					S_StartSound(NULL, sfx_menu1);
 				routine(-1);