diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 16b50c559d..aae1863beb 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -857,20 +857,15 @@ void ScreenEvaluation::TweenOffScreen()
 
 void ScreenEvaluation::Input( const InputEventPlus &input )
 {
-//	LOG->Trace( "ScreenEvaluation::Input()" );
-
 	if( IsTransitioning() )
 		return;
 
 	if( input.GameI.IsValid() )
 	{
-		PlayerNumber pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( input.GameI.controller );
-		const HighScore &hs = STATSMAN->m_CurStageStats.m_player[pn].m_HighScore;
-
-
 		if( CodeDetector::EnteredCode(input.GameI.controller, CODE_SAVE_SCREENSHOT1) ||
 			CodeDetector::EnteredCode(input.GameI.controller, CODE_SAVE_SCREENSHOT2) )
 		{
+			PlayerNumber pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( input.GameI.controller );
 			if( !m_bSavedScreenshot[pn]  &&	// only allow one screenshot
 				PROFILEMAN->IsPersistentProfile(pn) )
 			{
@@ -885,6 +880,7 @@ void ScreenEvaluation::Input( const InputEventPlus &input )
 				
 				if( !sFileName.empty() )
 				{
+					const HighScore &hs = STATSMAN->m_CurStageStats.m_player[pn].m_HighScore;
 					Screenshot screenshot;
 					screenshot.sFileName = sFileName;
 					screenshot.sMD5 = CRYPTMAN->GetMD5( sPath );