From 03205987f78ab58c6a383c183c18348c5e6bfeec Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.ddm999@gmail.com>
Date: Sat, 11 Jan 2020 02:57:32 +0000
Subject: [PATCH] some small menu fixes

- Return in Unlock Play Modes goes to Game Options instead of the main menu
- changing some Graphics Options settings no longer plays two menu select sounds, which was really loud :(
- Return in Game Pad Options plays the menu select sound
- turning off Screen Effects plays the menu select sound
---
 desktop_version/src/Input.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 1c3b0d30..2890f64b 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -428,7 +428,6 @@ SDL_assert(0 && "Remove open level dir");
                   if (game.currentmenuoption == 0){
                     music.playef(11, 10);
                     dwgfx.screenbuffer->toggleFullScreen();
-                    music.playef(11, 10);
                     game.fullscreen = !game.fullscreen;
                     updategraphicsmode(game, dwgfx);
                     game.savestats(map, dwgfx);
@@ -437,7 +436,6 @@ SDL_assert(0 && "Remove open level dir");
                   }else if (game.currentmenuoption == 1){
                     music.playef(11, 10);
                     dwgfx.screenbuffer->toggleStretchMode();
-                    music.playef(11, 10);
                     game.stretchMode = (game.stretchMode + 1) % 3;
                     updategraphicsmode(game, dwgfx);
                     game.savestats(map, dwgfx);
@@ -446,7 +444,6 @@ SDL_assert(0 && "Remove open level dir");
                   }else if (game.currentmenuoption == 2){
                     music.playef(11, 10);
                     dwgfx.screenbuffer->toggleLinearFilter();
-                    music.playef(11, 10);
                     game.useLinearFilter = !game.useLinearFilter;
                     updategraphicsmode(game, dwgfx);
                     game.savestats(map, dwgfx);
@@ -709,6 +706,8 @@ SDL_assert(0 && "Remove open level dir");
                             music.playef(18, 10);
                             game.screenshake = 10;
                             game.flashlight = 5;
+                        }else{
+                            music.playef(11, 10);
                         }
                     }
                     else if (game.currentmenuoption == 2)
@@ -1015,7 +1014,7 @@ SDL_assert(0 && "Remove open level dir");
                     {
                         //back
                         music.playef(11, 10);
-                        game.createmenu("mainmenu");
+                        game.createmenu("options");
                         map.nexttowercolour();
                     }
                 }
@@ -1332,6 +1331,7 @@ SDL_assert(0 && "Remove open level dir");
 
 					if (game.currentmenuoption == 4)
 					{
+                        music.playef(11, 10);
 						game.createmenu("options");
 
 						//Add extra menu for mmmmmm mod