Settings: Default to relative paths for bios/memcards

Prevents from locking to the directory the first time we run.
This commit is contained in:
Connor McLaughlin 2020-02-28 16:58:30 +10:00
parent 509f26ad7e
commit 50a155e775
2 changed files with 5 additions and 5 deletions

View File

@ -793,15 +793,15 @@ void HostInterface::SetDefaultSettings()
m_settings.audio_backend = AudioBackend::Cubeb; m_settings.audio_backend = AudioBackend::Cubeb;
m_settings.audio_sync_enabled = true; 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_tty_enable = false;
m_settings.bios_patch_fast_boot = false; m_settings.bios_patch_fast_boot = false;
m_settings.controller_types[0] = ControllerType::DigitalController; m_settings.controller_types[0] = ControllerType::DigitalController;
m_settings.controller_types[1] = ControllerType::None; m_settings.controller_types[1] = ControllerType::None;
m_settings.memory_card_paths[0] = GetSharedMemoryCardPath(0); m_settings.memory_card_paths[0] = "memcards/shared_card_1.mcd";
m_settings.memory_card_paths[1] = GetSharedMemoryCardPath(1); m_settings.memory_card_paths[1].clear();
} }
void HostInterface::UpdateSettings(const std::function<void()>& apply_callback) void HostInterface::UpdateSettings(const std::function<void()>& apply_callback)

View File

@ -37,7 +37,7 @@ void Settings::Load(SettingsInterface& si)
ParseAudioBackend(si.GetStringValue("Audio", "Backend", "Cubeb").c_str()).value_or(AudioBackend::Cubeb); ParseAudioBackend(si.GetStringValue("Audio", "Backend", "Cubeb").c_str()).value_or(AudioBackend::Cubeb);
audio_sync_enabled = si.GetBoolValue("Audio", "Sync", true); 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_tty_enable = si.GetBoolValue("BIOS", "PatchTTYEnable", true);
bios_patch_fast_boot = si.GetBoolValue("BIOS", "PatchFastBoot", false); bios_patch_fast_boot = si.GetBoolValue("BIOS", "PatchFastBoot", false);
@ -46,7 +46,7 @@ void Settings::Load(SettingsInterface& si)
controller_types[1] = controller_types[1] =
ParseControllerTypeName(si.GetStringValue("Controller2", "Type", "None").c_str()).value_or(ControllerType::None); 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", ""); memory_card_paths[1] = si.GetStringValue("MemoryCards", "Card2Path", "");
debugging.show_vram = si.GetBoolValue("Debug", "ShowVRAM"); debugging.show_vram = si.GetBoolValue("Debug", "ShowVRAM");