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

System: Fix playlist memory card handling

Browse source 
But you really don't need to use them these days.
This commit is contained in:
Stenzek 2023-10-29 20:37:40 +10:00
parent 3ee8159d8d
commit bd49e0df63
No known key found for this signature in database
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/system.cpp
View file

@ -1368,6 +1368,10 @@ bool System::BootSystem(SystemBootParameters parameters)
return false; return false;
} }
// Insert disc.
if (disc)
CDROM::InsertMedia(std::move(disc), disc_region);
UpdateControllers(); UpdateControllers();
UpdateMemoryCardTypes(); UpdateMemoryCardTypes();
UpdateMultitaps(); UpdateMultitaps();
@ -1387,9 +1391,7 @@ bool System::BootSystem(SystemBootParameters parameters)
return false; return false;
} }
// Insert CD, and apply fastboot patch if enabled. // Apply fastboot patch if enabled.
if (disc)
CDROM::InsertMedia(std::move(disc), disc_region);
if (CDROM::HasMedia() && (parameters.override_fast_boot.has_value() ? parameters.override_fast_boot.value() : if (CDROM::HasMedia() && (parameters.override_fast_boot.has_value() ? parameters.override_fast_boot.value() :
g_settings.bios_patch_fast_boot)) g_settings.bios_patch_fast_boot))
{ {
@ -2992,8 +2994,8 @@ std::unique_ptr<MemoryCard> System::GetMemoryCardForSlot(u32 slot, MemoryCardTyp
// Playlist - use title if different. // Playlist - use title if different.
if (HasMediaSubImages() && s_running_game_entry && s_running_game_title != s_running_game_entry->title) if (HasMediaSubImages() && s_running_game_entry && s_running_game_title != s_running_game_entry->title)
{ {
card_path = g_settings.GetGameMemoryCardPath( card_path =
MemoryCard::SanitizeGameTitleForFileName(s_running_game_entry->title), slot); g_settings.GetGameMemoryCardPath(MemoryCard::SanitizeGameTitleForFileName(s_running_game_title), slot);
} }
// Multi-disc game - use disc set name. // Multi-disc game - use disc set name.
else if (s_running_game_entry && !s_running_game_entry->disc_set_name.empty()) else if (s_running_game_entry && !s_running_game_entry->disc_set_name.empty())