From ac3920a0da590b5925c0dedde7372f8998223f7e Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Wed, 15 Jun 2022 10:42:14 +0200 Subject: [PATCH] Qt/GameCubePane: Fix swapping memory cards mid-emulation. --- Source/Core/DolphinQt/Settings/GameCubePane.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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