cleanup: don't export options from SM_GoToNextScreen

(need to get rid of this AutoScreenMessage thing; causes duplicate variables
to be declared for every file that includes it)

stepmania/src/ScreenOptionsMaster.cpp

@@ -212,7 +212,7 @@ void ScreenOptionsMaster::RefreshIcons( int r, PlayerNumber pn )
 
 void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
 {
-	if( SM == SM_GoToNextScreen )
+	if( SM == SM_ExportOptions )
 	{
 		//
 		// Override ScreenOptions's calling of ExportOptions
@@ -271,7 +271,7 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
 
 		CHECKPOINT;
 		if( !(m_iChangeMask & OPT_RESET_GAME) )
-			this->GoToNextScreen();
+			this->HandleScreenMessage( SM_GoToNextScreen );
 	}
 	else
 		ScreenOptions::HandleScreenMessage( SM );