diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7a30c79338..1880615d26 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -14,6 +14,7 @@ [Common] ColorP1=0.4,1.0,0.8,1 // sea green ColorP2=1.0,0.5,0.2,1 // orange +FirstRunInitialScreen=ScreenCompany InitialScreen=ScreenCompany WindowTitle=StepMania DefaultModifiers= diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 53222ab610..ee7d091ec0 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -215,8 +215,6 @@ void ResetGame( bool ReturnToFirstScreen ) } SaveGamePrefsToDisk(); - PREFSMAN->m_bFirstRun = false; - // // update last seen joysticks @@ -241,7 +239,14 @@ void ResetGame( bool ReturnToFirstScreen ) if( ReturnToFirstScreen ) - SCREENMAN->SetNewScreen( THEME->GetMetric("Common","InitialScreen") ); + { + if( PREFSMAN->m_bFirstRun ) + SCREENMAN->SetNewScreen( THEME->GetMetric("Common","FirstRunInitialScreen") ); + else + SCREENMAN->SetNewScreen( THEME->GetMetric("Common","InitialScreen") ); + } + + PREFSMAN->m_bFirstRun = false; } static void GameLoop();