From 786d8a4d96cc896e5c71f9619b6082f6d5b6c812 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 16 Jan 2006 21:44:04 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/ScreenOptions.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index a3ff73f29a..3f35142be6 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -852,27 +852,30 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
 	int iCurRow = m_iCurrentRow[pn];
 	OptionRow &row = *m_pRows[iCurRow];
 
+	if( m_OptionsNavigation == NAV_THREE_KEY_MENU )
+	{
+		/* In NAV_THREE_KEY_MENU mode, if a row doesn't set a screen, it does
+		 * something.  Apply it now, and don't go to the next screen. */
+		CString sScreen = GetNextScreenForSelection( input.MenuI.player );
+		if( sScreen.empty() )
+		{
+			vector<PlayerNumber> vpns;
+			vpns.push_back( input.MenuI.player );
+			ExportOptions( iCurRow, vpns );
+			return;
+		}
+	}
+
 	//
 	// Check whether Start ends this screen.
 	//
 	{
 		bool bEndThisScreen = false;
 
+		// If we didn't apply and return above in NAV_THREE_KEY_MENU, then the selection
+		// sets a screen.
 		if( m_OptionsNavigation == NAV_THREE_KEY_MENU )
-		{
-			/* In NAV_THREE_KEY_MENU mode, if a row doesn't set a screen, it does
-			 * something.  Apply it now. */
-			CString sScreen = GetNextScreenForSelection( input.MenuI.player );
-			if( sScreen.empty() )
-			{
-				vector<PlayerNumber> vpns;
-				vpns.push_back( input.MenuI.player );
-				ExportOptions( iCurRow, vpns );
-				return;
-			}
-
 			bEndThisScreen = true;
-		}
 
 		// If there's no exit row, then pressing Start on any row ends the screen.
 		if( !SHOW_EXIT_ROW )