Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pad: Don't remove card when loading state without card in slot

Browse source 
... unless load-devices-from-state is enabled.
This commit is contained in:
Connor McLaughlin 2021-04-27 02:24:25 +10:00
parent e842abfa8a
commit b84827b315
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/pad.cpp
View file

@ -200,12 +200,24 @@ bool Pad::DoStateMemcard(StateWrapper& sw, u32 i)
if (!card_present_in_state && m_memory_cards[i])
{
g_host_interface->AddFormattedOSDMessage(
20.0f,
g_host_interface->TranslateString("OSDMessage",
"Memory card %u present in system but not in save state. Removing card."),
i + 1u);
m_memory_cards[i].reset();
if (g_settings.load_devices_from_save_states)
{
g_host_interface->AddFormattedOSDMessage(
20.0f,
g_host_interface->TranslateString("OSDMessage",
"Memory card %u present in system but not in save state. Removing card."),
i + 1u);
m_memory_cards[i].reset();
}
else
{
g_host_interface->AddFormattedOSDMessage(
20.0f,
g_host_interface->TranslateString("OSDMessage",
"Memory card %u present in system but not in save state. Replugging card."),
i + 1u);
m_memory_cards[i]->Reset();
}
}
return true;