diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-02-28 21:46:04 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-02-28 21:46:04 +0000 |
| commit | c1cf2a9a9985d2c91f1009bc2fc3a5fc4f98f96d (patch) | |
| tree | 92b64bac3bc13fc40b72572ece1910eb6ceab79e /Source | |
| parent | 9a93928e3e5a3e9dff48aabb9c8bbe78c53f3e1d (diff) | |
allow changing of memcard path(and device) during emulation.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2482 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index d4b8f807ed..6256416bc1 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -137,7 +137,6 @@ void CConfigMain::UpdateGUI() SkipIdle->Disable(); EnableCheats->Disable(); GCSystemLang->Disable(); - GCMemcardPath[0]->Disable(); GCMemcardPath[1]->Disable(); // Disable GC SI Stuff, but devices should be dynamic soon GCSIDevice[0]->Disable(); GCSIDevice[1]->Disable(); GCSIDevice[2]->Disable(); GCSIDevice[3]->Disable(); WiiPage->Disable(); @@ -671,7 +670,18 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str()); if (!filename.empty()) + { strMemcard = filename; + + if (Core::GetState() != Core::CORE_UNINITIALIZED) + { + // Change memcard to the new file + ExpansionInterface::ChangeDevice( + (isSlotA) ? 0 : 1, // SlotA: channel 0, SlotB channel 1 + (isSlotA) ? EXIDEVICE_MEMORYCARD_A : EXIDEVICE_MEMORYCARD_B, + 0); // SP1 is device 2, slots are device 0 + } + } } void CConfigMain::ChooseSIDevice(std::string deviceName, int deviceNum) |