From 7c697f363e6a5a6f049628625c79af9d8589fd6e Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 17 Aug 2020 11:42:22 +1000 Subject: [PATCH] libretro: Make single cards for playlist the default, fix disabled case This bug was causing the option to act as if it was disabled anyway. --- src/core/system.cpp | 2 +- src/duckstation-libretro/libretro_host_interface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 0420a482a..4f3ff2009 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -392,7 +392,7 @@ bool Boot(const SystemBootParameters& params) } // Notify change of disc. - UpdateRunningGame(params.filename.c_str(), media.get()); + UpdateRunningGame(media ? media->GetFileName().c_str() : params.filename.c_str(), media.get()); UpdateControllers(); UpdateMemoryCards(); Reset(); diff --git a/src/duckstation-libretro/libretro_host_interface.cpp b/src/duckstation-libretro/libretro_host_interface.cpp index 35d0d1153..3c47950f0 100644 --- a/src/duckstation-libretro/libretro_host_interface.cpp +++ b/src/duckstation-libretro/libretro_host_interface.cpp @@ -520,7 +520,7 @@ static std::array s_option_definitions = {{ "When using a playlist (m3u) and per-game (title) memory cards, a single memory card " "will be used for all discs. If unchecked, a separate card will be used for each disc.", {{"true", "Enabled"}, {"false", "Disabled"}}, - "false"}, + "true"}, {"duckstation_Controller1.Type", "Controller 1 Type", "Sets the type of controller for Slot 1.",