This commit is contained in:
Glenn Maynard
2005-04-22 04:28:46 +00:00
parent b252d7b3f7
commit 890fbb8b55
+9 -12
View File
@@ -129,22 +129,19 @@ bool ProfileManager::LoadProfileFromMemoryCard( PlayerNumber pn )
UnloadProfile( pn ); UnloadProfile( pn );
// mount slot // mount slot
if( MEMCARDMAN->GetCardState(pn) == MEMORY_CARD_STATE_READY ) if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
{ return false;
CString sDir = MEM_CARD_MOUNT_POINT[pn]; CString sDir = MEM_CARD_MOUNT_POINT[pn];
// tack on a subdirectory so that we don't write everything to the root // tack on a subdirectory so that we don't write everything to the root
sDir += PREFSMAN->m_sMemoryCardProfileSubdir; sDir += PREFSMAN->m_sMemoryCardProfileSubdir;
sDir += '/'; sDir += '/';
bool bSuccess; bool bSuccess;
bSuccess = LoadProfile( pn, sDir, true ); bSuccess = LoadProfile( pn, sDir, true );
return true; // If a card is inserted, we want to use the memory card to save - even if the Profile load failed. return true; // If a card is inserted, we want to use the memory card to save - even if the Profile load failed.
}
return false;
} }
bool ProfileManager::LoadFirstAvailableProfile( PlayerNumber pn ) bool ProfileManager::LoadFirstAvailableProfile( PlayerNumber pn )