From ac64504077b336db7d30a2444b773c4508efd528 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Mon, 24 May 2010 23:52:36 -0500
Subject: [PATCH] force ScreenSelectProfile to load preferences; it doesn't
 increment playcount but i don't care right now

---
 src/ScreenSelectProfile.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ScreenSelectProfile.cpp b/src/ScreenSelectProfile.cpp
index bbc680e757..2ea7bf6c42 100644
--- a/src/ScreenSelectProfile.cpp
+++ b/src/ScreenSelectProfile.cpp
@@ -67,9 +67,7 @@ bool ScreenSelectProfile::Finish(){
 
 	// if profile indexes are the same for both players
 	if( GAMESTATE->GetNumPlayersEnabled() == 2 && m_iSelectedProfiles[0] == m_iSelectedProfiles[1] && m_iSelectedProfiles[0] > 0 )
-	{
 		return false;
-	}
 
 	int iUsedLocalProfiles = 0;
 	int iUnselectedProfiles = 0;
@@ -108,6 +106,7 @@ bool ScreenSelectProfile::Finish(){
 		{
 			PROFILEMAN->m_sDefaultLocalProfileID[p].Set( PROFILEMAN->GetLocalProfileIDFromIndex( m_iSelectedProfiles[p] - 1 ) );
 			PROFILEMAN->LoadLocalProfileFromMachine( p );
+			GAMESTATE->LoadCurrentSettingsFromProfile(p);
 		}
 		if( m_iSelectedProfiles[p] == 0 )
 		{
@@ -119,7 +118,10 @@ bool ScreenSelectProfile::Finish(){
 
 			// Lock the card on successful load, so we won't allow it to be changed.
 			if( bSuccess )
+			{
+				GAMESTATE->LoadCurrentSettingsFromProfile(p);
 				MEMCARDMAN->LockCard( p );
+			}
 		}
 	}
 	StartTransitioningScreen( SM_GoToNextScreen );