interface to allow more specific error messages

This commit is contained in:
Glenn Maynard
2005-04-22 05:48:52 +00:00
parent 0d9b7c943a
commit 30c3578cdc
6 changed files with 27 additions and 15 deletions
+6 -3
View File
@@ -413,6 +413,7 @@ void MemoryCardManager::CheckStateChanges()
UsbStorageDevice &new_device = m_Device[p];
MemoryCardState state = MEMORY_CARD_STATE_INVALID;
CString sError;
if( m_bCardsLocked )
{
@@ -434,9 +435,9 @@ void MemoryCardManager::CheckStateChanges()
{
if( m_FinalDevice[p].sSerial != new_device.sSerial )
{
/* A different card is inserted than we had when we finalized;
* ignore it. */
state = MEMORY_CARD_STATE_REMOVED;
/* A different card is inserted than we had when we finalized. */
state = MEMORY_CARD_STATE_ERROR;
sError = "Changed";
}
}
@@ -458,6 +459,7 @@ void MemoryCardManager::CheckStateChanges()
case UsbStorageDevice::STATE_ERROR:
state = MEMORY_CARD_STATE_ERROR;
sError = new_device.m_sError;
break;
case UsbStorageDevice::STATE_READY:
@@ -489,6 +491,7 @@ void MemoryCardManager::CheckStateChanges()
}
m_State[p] = state;
m_sError[p] = sError;
}
}