actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix crash after trying to load a non-existant local profile

Browse Source
This commit is contained in:
Chris Danford
2005-07-18 17:34:47 +00:00
parent c3fd71dd76
commit 2a3bc57f43
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ProfileManager.cpp
+18 -6
View File
@@ -130,9 +130,18 @@ bool ProfileManager::LoadLocalProfileFromMachine( PlayerNumber pn )
return false; return false;
} }
CString sDir = LocalProfileIdToDir( sProfileID ); m_sProfileDir[pn] = LocalProfileIdToDir( sProfileID );
m_bWasLoadedFromMemoryCard[pn] = false;
m_bLastLoadWasFromLastGood[pn] = false;
return LoadProfile( pn, sDir, false ) == Profile::success; map<CString,Profile*>::iterator iter = g_mapLocalProfileDirToProfile.find( m_sProfileDir[pn] );
if( iter == g_mapLocalProfileDirToProfile.end() )
{
m_sProfileDir[pn] = "";
return false;
}
return true;
} }
void ProfileManager::GetMemoryCardProfileDirectoriesToTry( vector<CString> &asDirsToTry ) const void ProfileManager::GetMemoryCardProfileDirectoriesToTry( vector<CString> &asDirsToTry ) const
@@ -278,9 +287,15 @@ const Profile* ProfileManager::GetProfile( PlayerNumber pn ) const
ASSERT( pn >= 0 && pn < NUM_PLAYERS ); ASSERT( pn >= 0 && pn < NUM_PLAYERS );
if( m_sProfileDir[pn].empty() || ProfileWasLoadedFromMemoryCard(pn) ) if( m_sProfileDir[pn].empty() || ProfileWasLoadedFromMemoryCard(pn) )
{
return m_pMemoryCardProfile[pn]; return m_pMemoryCardProfile[pn];
}
else else
return g_mapLocalProfileDirToProfile[ m_sProfileDir[pn] ]; {
map<CString,Profile*>::iterator iter = g_mapLocalProfileDirToProfile.find( m_sProfileDir[pn] );
ASSERT( iter != g_mapLocalProfileDirToProfile.end() );
return iter->second;
}
} }
CString ProfileManager::GetPlayerName( PlayerNumber pn ) const CString ProfileManager::GetPlayerName( PlayerNumber pn ) const
@@ -476,9 +491,6 @@ const Profile* ProfileManager::GetProfile( ProfileSlot slot ) const
{ {
case PROFILE_SLOT_PLAYER_1: case PROFILE_SLOT_PLAYER_1:
case PROFILE_SLOT_PLAYER_2: case PROFILE_SLOT_PLAYER_2:
if( m_sProfileDir[slot].empty() )
return NULL;
else
return GetProfile( (PlayerNumber)slot ); return GetProfile( (PlayerNumber)slot );
case PROFILE_SLOT_MACHINE: case PROFILE_SLOT_MACHINE:
return m_pMachineProfile; return m_pMachineProfile;