make it significantly harder to choose an invalid memory card file in the main dolphin config

should fix most errors of "Can not use memory card in slot A"
also fix display of a (rarely seen) panicalertT when the same file is chosen for both memorycards
recent examples ... http://forums.dolphin-emulator.com/showthread.php?tid=18408 http://forums.dolphin-emulator.com/showthread.php?tid=18354

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7694 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2011-08-07 07:17:49 +00:00
parent 2a829fe36c
commit 5f9591cf9d
4 changed files with 105 additions and 88 deletions

View File

@ -606,7 +606,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
// TODO: add error checking and animate icons
memoryCard[card] = new GCMemcard(fileName);
if (memoryCard[card]->fail) return false;
if (!memoryCard[card]->IsValid()) return false;
int j;