summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2022-06-15 15:04:41 +0200
committerGitHub <noreply@github.com>2022-06-15 15:04:41 +0200
commitf73b14bb01c007ff768b05e7298a274cc322be2c (patch)
treee6f764b272abd4e5a47d9480e425def45b7870a8
parent431d757151f329780f99e606102f444787640d73 (diff)
parentac3920a0da590b5925c0dedde7372f8998223f7e (diff)
Merge pull request #10756 from AdmiralCurtiss/qt-memcard-change-hotfix
Qt/GameCubePane: Fix swapping memory cards mid-emulation.
-rw-r--r--Source/Core/DolphinQt/Settings/GameCubePane.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Settings/GameCubePane.cpp b/Source/Core/DolphinQt/Settings/GameCubePane.cpp
index 82aea64a23..94591c7721 100644
--- a/Source/Core/DolphinQt/Settings/GameCubePane.cpp
+++ b/Source/Core/DolphinQt/Settings/GameCubePane.cpp
@@ -372,6 +372,7 @@ void GameCubePane::BrowseMemcard(ExpansionInterface::Slot slot)
}
}
+ const std::string old_eu_path = Config::GetMemcardPath(slot, DiscIO::Region::PAL);
Config::SetBase(Config::GetInfoForMemcardPath(slot), raw_path);
if (Core::IsRunning())
@@ -379,7 +380,6 @@ void GameCubePane::BrowseMemcard(ExpansionInterface::Slot slot)
// If emulation is running and the new card is different from the old one, notify the system to
// eject the old and insert the new card.
// TODO: This should probably done by a config change callback instead.
- const std::string old_eu_path = Config::GetMemcardPath(slot, DiscIO::Region::PAL);
if (eu_path != old_eu_path)
{
// ChangeDevice unplugs the device for 1 second, which means that games should notice that