diff options
| author | JMC47 <JMC4789@gmail.com> | 2020-09-22 14:03:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 14:03:56 -0400 |
| commit | f33767f19cca6ee95af9727f0050f27e2571f770 (patch) | |
| tree | eec5cc6be202dac8099f4f34c4ab6b655c564041 /Source/Core | |
| parent | 50b5224d0628ff15af12c169304a5bebd50c7913 (diff) | |
| parent | 7749e8c10c65dfb7c8f31d0e3793bcc143ea9c14 (diff) | |
Merge pull request #9088 from JosJuice/android-sysconf
Android: Add Wii SYSCONF settings to GUI
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/BootManager.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 23de16583b..20925f8685 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -401,7 +401,8 @@ bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi) { const u32 wii_language = static_cast<u32>(StartUp.GetLanguageAdjustedForRegion(true, StartUp.m_region)); - Config::SetCurrent(Config::SYSCONF_LANGUAGE, wii_language); + if (wii_language != Config::Get(Config::SYSCONF_LANGUAGE)) + Config::SetCurrent(Config::SYSCONF_LANGUAGE, wii_language); const u8 country_code = static_cast<u8>(Config::Get(Config::SYSCONF_COUNTRY)); if (StartUp.m_region != DiscIO::SysConfCountryToRegion(country_code)) @@ -429,7 +430,7 @@ bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi) // Some NTSC Wii games such as Doc Louis's Punch-Out!! and // 1942 (Virtual Console) crash if the PAL60 option is enabled - if (StartUp.bWii && DiscIO::IsNTSC(StartUp.m_region)) + if (StartUp.bWii && DiscIO::IsNTSC(StartUp.m_region) && Config::Get(Config::SYSCONF_PAL60)) Config::SetCurrent(Config::SYSCONF_PAL60, false); // Ensure any new settings are written to the SYSCONF diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp index 4e9dcc7005..7195dfd97b 100644 --- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp +++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp @@ -16,8 +16,8 @@ namespace ConfigLoaders { bool IsSettingSaveable(const Config::Location& config_location) { - for (Config::System system : - {Config::System::GFX, Config::System::DualShockUDPClient, Config::System::Logger}) + for (Config::System system : {Config::System::SYSCONF, Config::System::GFX, + Config::System::DualShockUDPClient, Config::System::Logger}) { if (config_location.system == system) return true; |