From 65788290f66e1dfca86e4bf11fcea8e366b68aa4 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Tue, 11 Jan 2022 16:02:43 -0800 Subject: [PATCH] Raise a panic alert if a movie is recorded with memcards but no memcards are inserted --- Source/Core/Core/HW/EXI/EXI.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI.cpp b/Source/Core/Core/HW/EXI/EXI.cpp index 9e1a03e08f..e10403e495 100644 --- a/Source/Core/Core/HW/EXI/EXI.cpp +++ b/Source/Core/Core/HW/EXI/EXI.cpp @@ -46,10 +46,16 @@ void AddMemoryCard(Slot slot) { if (Movie::IsUsingMemcard(slot)) { - if (Config::Get(Config::GetInfoForEXIDevice(slot)) == EXIDeviceType::MemoryCardFolder) - memorycard_device = EXIDeviceType::MemoryCardFolder; - else - memorycard_device = EXIDeviceType::MemoryCard; + memorycard_device = Config::Get(Config::GetInfoForEXIDevice(slot)); + if (memorycard_device != EXIDeviceType::MemoryCardFolder && + memorycard_device != EXIDeviceType::MemoryCard) + { + PanicAlertFmtT( + "The movie indicates that a memory card should be inserted into {0:n}, but one is not " + "currently inserted (instead, {1} is inserted). For the movie to sync properly, " + "please change the selected device to Memory Card or GCI Folder.", + slot, Common::GetStringT(fmt::format("{:n}", memorycard_device).c_str())); + } } else {