From cec320d92353863be4cb2c7841da72ed1a24737e Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Mon, 19 Jul 2010 11:19:01 -0500
Subject: [PATCH] slight change; UnpauseOnStart -> UnpauseWithStart to match
 internal metric name

---
 Themes/_fallback/metrics.ini |  2 +-
 src/ScreenGameplay.cpp       | 10 ++++++----
 src/ScreenGameplay.h         |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 936e832ba3..b2c0a98c09 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2837,7 +2837,7 @@ StopCourseEarly=false
 ShowEvaluationOnFail=true
 ShowScoreInRave=false
 #
-UnpauseOnStart=true
+UnpauseWithStart=true
 #
 InitialBackgroundBrightness=1.0
 TimerSeconds=-1
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 39d2dda170..0a706417e7 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -353,8 +353,8 @@ void ScreenGameplay::Init()
 	FAIL_ON_MISS_COMBO.Load(		m_sName, "FailOnMissCombo" );
 	ALLOW_CENTER_1_PLAYER.Load(		m_sName, "AllowCenter1Player" );
 	USE_ALTERNATIVE_INPUT.Load(		m_sName, "UseAlternativeInput");
-	//configurable
-	UNPAUSE_WITH_GAME_BUTTON_START.Load(	m_sName, "UnpauseOnStart" );
+	// configurable:
+	UNPAUSE_WITH_START.Load(		m_sName, "UnpauseWithStart")
 
 	if( UseSongBackgroundAndForeground() )
 	{
@@ -2172,9 +2172,11 @@ void ScreenGameplay::Input( const InputEventPlus &input )
 		if( GAMESTATE->IsHumanPlayer(input.pn) && input.MenuI == GAME_BUTTON_START && input.type == IET_FIRST_PRESS )
 		{
 			if( m_PauseController == GameController_Invalid || m_PauseController == input.GameI.controller )
-				//IMO is better to have this configurable -DaisuMaster
-				if( UNPAUSE_WITH_GAME_BUTTON_START )
+			{
+				// IMO, it's better to have this configurable. -DaisuMaster
+				if( UNPAUSE_WITH_START )
 					this->PauseGame( false );
+			}
 		}
 		return;
 	}
diff --git a/src/ScreenGameplay.h b/src/ScreenGameplay.h
index a2f85fc015..84dccd5a40 100644
--- a/src/ScreenGameplay.h
+++ b/src/ScreenGameplay.h
@@ -151,7 +151,7 @@ protected:
 	ThemeMetric<int> FAIL_ON_MISS_COMBO;
 	ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
 	ThemeMetric<bool> USE_ALTERNATIVE_INPUT;
-	ThemeMetric<bool> UNPAUSE_WITH_GAME_BUTTON_START;
+	ThemeMetric<bool> UNPAUSE_WITH_START;
 
 	vector<AlternateMapping> m_vAlterMap;