add error return from MountCard

This commit is contained in:
Glenn Maynard
2005-05-22 01:44:37 +00:00
parent 4c8c5bea37
commit 48f74fb55e
2 changed files with 6 additions and 4 deletions
+5 -3
View File
@@ -568,11 +568,11 @@ void MemoryCardManager::UnlockCards()
}
/* Called just before reading or writing to the memory card. Should block. */
void MemoryCardManager::MountCard( PlayerNumber pn, int iTimeout )
bool MemoryCardManager::MountCard( PlayerNumber pn, int iTimeout )
{
LOG->Trace( "MemoryCardManager::MountCard(%i)", pn );
if( GetCardState(pn) != MEMORY_CARD_STATE_READY )
return;
return false;
ASSERT( !m_Device[pn].IsBlank() );
/* Pause the mounting thread when we mount the first drive. */
@@ -591,7 +591,7 @@ void MemoryCardManager::MountCard( PlayerNumber pn, int iTimeout )
if( bStartingMemoryCardAccess )
this->UnPauseMountingThread();
return;
return false;
}
m_bMounted[pn] = true;
@@ -623,6 +623,8 @@ void MemoryCardManager::MountCard( PlayerNumber pn, int iTimeout )
FILEMAN->ReleaseFileDriver( pDriver );
}
return true;
}
/* Called in EndGame just after writing the profile. Called by PlayersFinalized just after