play cancel sound when using CancelTransitionsOut, not start sound

stepmania/Themes/default/Sounds/Common cancel.redir

@@ -0,0 +1 @@
+_cancel

stepmania/src/ScreenManager.cpp

@@ -256,6 +256,7 @@ void ScreenManager::ThemeChanged()
 	// reload common sounds
 	m_soundStart.Load( THEME->GetPathS("Common","start") );
 	m_soundCoin.Load( THEME->GetPathS("Common","coin"), true );
+	m_soundCancel.Load( THEME->GetPathS("Common","cancel"), true );
 	m_soundInvalid.Load( THEME->GetPathS("Common","invalid") );
 	m_soundScreenshot.Load( THEME->GetPathS("Common","screenshot") );
 
@@ -852,6 +853,13 @@ void ScreenManager::PlayCoinSound()
 	m_soundCoin.Play( &p );
 }
 
+void ScreenManager::PlayCancelSound()
+{
+	RageSoundParams p;
+	p.m_bIsCriticalSound = true;
+	m_soundCancel.Play( &p );
+}
+
 void ScreenManager::PlayScreenshotSound()
 {
 	RageSoundParams p;

stepmania/src/ScreenManager.h

@@ -92,12 +92,14 @@ private:
 public:
 	void PlayStartSound();
 	void PlayCoinSound();
+	void PlayCancelSound();
 	void PlayInvalidSound();
 	void PlayScreenshotSound();
 
 private:
 	RageSound	m_soundStart;
 	RageSound	m_soundCoin;
+	RageSound	m_soundCancel;
 	RageSound	m_soundInvalid;
 	RageSound	m_soundScreenshot;
 };

stepmania/src/ScreenOptions.cpp

@@ -758,8 +758,6 @@ void ScreenOptions::AfterChangeValueOrRow( PlayerNumber pn )
 
 void ScreenOptions::MenuBack( PlayerNumber pn )
 {
-	Screen::MenuBack( pn );
-
 	Cancel( SM_GoToPrevScreen );
 }
 

stepmania/src/ScreenWithMenuElements.cpp

@@ -276,7 +276,7 @@ void ScreenWithMenuElements::Cancel( ScreenMessage smSendWhenDone )
 {
 	if( CANCEL_TRANSITIONS_OUT )
 	{
-		SCREENMAN->PlayStartSound();
+		SCREENMAN->PlayCancelSound();
 		StartTransitioningScreen( smSendWhenDone );
 		return;
 	}