Disabled ESC to exit in practice setup

This is to reduce confusion between practice setup / play
Drewol · Jul 17, 2020 · ecef76b · ecef76b
1 parent c69c529
commit ecef76b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Main/include/PracticeModeSettingsDialog.hpp b/Main/include/PracticeModeSettingsDialog.hpp
@@ -15,6 +15,7 @@ class PracticeModeSettingsDialog : public BaseGameSettingsDialog
 	Delegate<float> onSpeedChange;
 	Delegate<> onSettingChange;
 	Delegate<> onPressStart;
+	Delegate<> onPressExit;
 
 private:
 	Tab m_CreateMainSettingTab();

diff --git a/Main/src/Game.cpp b/Main/src/Game.cpp
@@ -1981,11 +1981,9 @@ class Game_Impl : public Game
 			switch (buttonCode)
 			{
 			case Input::Button::Back:
-				TriggerManualExit();
-				break;
 			case Input::Button::FX_0:
 			case Input::Button::FX_1:
-				if (g_input.GetButton(buttonCode == Input::Button::FX_0 ? Input::Button::FX_1 : Input::Button::FX_0))
+				if (buttonCode == Input::Button::Back || g_input.GetButton(buttonCode == Input::Button::FX_0 ? Input::Button::FX_1 : Input::Button::FX_0))
 				{
 					m_audioPlayback.Pause();
 					m_paused = true;
@@ -2160,9 +2158,8 @@ class Game_Impl : public Game
 				JumpTo(m_lastMapTime);
 			}
 		});
-		m_practiceSetupDialog->onPressStart.AddLambda([this]() {
-			StartPractice();
-		});
+		m_practiceSetupDialog->onPressStart.Add(this, &Game_Impl::StartPractice);
+		m_practiceSetupDialog->onPressExit.Add(this, &Game_Impl::TriggerManualExit);
 	}
 
 	void RevertToPracticeSetup()

diff --git a/Main/src/PracticeModeSettingsDialog.cpp b/Main/src/PracticeModeSettingsDialog.cpp
@@ -54,6 +54,7 @@ PracticeModeSettingsDialog::Tab PracticeModeSettingsDialog::m_CreateMainSettingT
     mainSettingTab->settings.emplace_back(std::move(speedSetting));
 
     mainSettingTab->settings.emplace_back(CreateButton("Start practice", [this](const auto&) { onPressStart.Call(); }));
+    mainSettingTab->settings.emplace_back(CreateButton("Exit to song selection", [this](const auto&) { onPressExit.Call(); }));
 
     return mainSettingTab;
 }