ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the twocardsloaded settings, correctly disables the copy functions when only one card is loaded 

Signed-off-by: LPFaint99 <lpfaint99@gmail.com>
This commit is contained in:
LPFaint99 2011-12-09 14:58:58 -08:00
parent c9dfcf8cf7
commit 98993bfbd3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -101,6 +101,7 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString
memoryCard[SLOT_A]=NULL; memoryCard[SLOT_A]=NULL;
memoryCard[SLOT_B]=NULL; memoryCard[SLOT_B]=NULL;
mcmSettings.twoCardsLoaded = false;
if (!LoadSettings()) if (!LoadSettings())
{ {
itemsPerPage = 16; itemsPerPage = 16;
@ -283,7 +284,7 @@ void CMemcardManager::ChangePath(int slot)
m_PrevPage[slot]->Disable(); m_PrevPage[slot]->Disable();
m_MemcardList[slot]->prevPage = false; m_MemcardList[slot]->prevPage = false;
} }
if (!strcasecmp(m_MemcardPath[slot2]->GetPath().mb_str(), m_MemcardPath[slot]->GetPath().mb_str())) if (!m_MemcardPath[SLOT_A]->GetPath().CmpNoCase(m_MemcardPath[SLOT_B]->GetPath()))
{ {
if(m_MemcardPath[slot]->GetPath().length()) if(m_MemcardPath[slot]->GetPath().length())
PanicAlertT("Memcard already opened"); PanicAlertT("Memcard already opened");
@ -292,7 +293,10 @@ void CMemcardManager::ChangePath(int slot)
{ {
if (m_MemcardPath[slot]->GetPath().length() && ReloadMemcard(m_MemcardPath[slot]->GetPath().mb_str(), slot)) if (m_MemcardPath[slot]->GetPath().length() && ReloadMemcard(m_MemcardPath[slot]->GetPath().mb_str(), slot))
{ {
mcmSettings.twoCardsLoaded = true; if (memoryCard[slot2])
{
mcmSettings.twoCardsLoaded = true;
}
m_SaveImport[slot]->Enable(); m_SaveImport[slot]->Enable();
m_SaveExport[slot]->Enable(); m_SaveExport[slot]->Enable();
m_Delete[slot]->Enable(); m_Delete[slot]->Enable();
@ -318,16 +322,9 @@ void CMemcardManager::ChangePath(int slot)
} }
} }
} }
if (m_Delete[SLOT_A]->IsEnabled() && m_Delete[SLOT_B]->IsEnabled())
{ m_CopyFrom[SLOT_A]->Enable(mcmSettings.twoCardsLoaded);
m_CopyFrom[SLOT_A]->Enable(); m_CopyFrom[SLOT_B]->Enable(mcmSettings.twoCardsLoaded);
m_CopyFrom[SLOT_B]->Enable();
}
else
{
m_CopyFrom[SLOT_A]->Disable();
m_CopyFrom[SLOT_B]->Disable();
}
} }
void CMemcardManager::OnPageChange(wxCommandEvent& event) void CMemcardManager::OnPageChange(wxCommandEvent& event)