From 50a155e775633735ff2ccbd77d5c7d9b1123f6cd Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 28 Feb 2020 16:58:30 +1000 Subject: [PATCH] Settings: Default to relative paths for bios/memcards Prevents from locking to the directory the first time we run. --- src/core/host_interface.cpp | 6 +++--- src/core/settings.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index 86af9b33e..feb359536 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -793,15 +793,15 @@ void HostInterface::SetDefaultSettings() m_settings.audio_backend = AudioBackend::Cubeb; m_settings.audio_sync_enabled = true; - m_settings.bios_path = GetUserDirectoryRelativePath("bios/scph1001.bin"); + m_settings.bios_path = "bios/scph1001.bin"; m_settings.bios_patch_tty_enable = false; m_settings.bios_patch_fast_boot = false; m_settings.controller_types[0] = ControllerType::DigitalController; m_settings.controller_types[1] = ControllerType::None; - m_settings.memory_card_paths[0] = GetSharedMemoryCardPath(0); - m_settings.memory_card_paths[1] = GetSharedMemoryCardPath(1); + m_settings.memory_card_paths[0] = "memcards/shared_card_1.mcd"; + m_settings.memory_card_paths[1].clear(); } void HostInterface::UpdateSettings(const std::function& apply_callback) diff --git a/src/core/settings.cpp b/src/core/settings.cpp index b0ffbe0c7..111189ddd 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -37,7 +37,7 @@ void Settings::Load(SettingsInterface& si) ParseAudioBackend(si.GetStringValue("Audio", "Backend", "Cubeb").c_str()).value_or(AudioBackend::Cubeb); audio_sync_enabled = si.GetBoolValue("Audio", "Sync", true); - bios_path = si.GetStringValue("BIOS", "Path", "scph1001.bin"); + bios_path = si.GetStringValue("BIOS", "Path", "bios/scph1001.bin"); bios_patch_tty_enable = si.GetBoolValue("BIOS", "PatchTTYEnable", true); bios_patch_fast_boot = si.GetBoolValue("BIOS", "PatchFastBoot", false); @@ -46,7 +46,7 @@ void Settings::Load(SettingsInterface& si) controller_types[1] = ParseControllerTypeName(si.GetStringValue("Controller2", "Type", "None").c_str()).value_or(ControllerType::None); - memory_card_paths[0] = si.GetStringValue("MemoryCards", "Card1Path", "memory_card_1.mcd"); + memory_card_paths[0] = si.GetStringValue("MemoryCards", "Card1Path", "memcards/shared_card_1.mcd"); memory_card_paths[1] = si.GetStringValue("MemoryCards", "Card2Path", ""); debugging.show_vram = si.GetBoolValue("Debug", "ShowVRAM");