allow and make ssm lock the wheel directly on song finalize

etternagame · Dec 4, 2018 · 4689f71 · 4689f71
1 parent 1c3b3d9
commit 4689f71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
@@ -1229,7 +1229,7 @@ ScreenSelectMusic::SelectCurrent(PlayerNumber pn)
 		 * requests come through, the music will still start. */
 		m_BackgroundLoader.Abort();
 		CheckBackgroundRequests(true);
-
+		m_MusicWheel.Lock();
 		if (OPTIONS_MENU_AVAILABLE) {
 			// show "hold START for options"
 			this->PlayCommand("ShowPressStartForOptions");

diff --git a/src/WheelBase.h b/src/WheelBase.h
@@ -61,6 +61,7 @@ class WheelBase : public ActorFrame
 	virtual bool Select(); // return true if this selection can end the screen
 
 	WheelState GetWheelState() { return m_WheelState; }
+	void Lock() { m_WheelState = STATE_LOCKED; }
 	bool WheelIsLocked()
 	{
 		return (m_WheelState == STATE_LOCKED ? true : false);