Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android: Add Wii SYSCONF settings to GUI #9088

Merged
merged 4 commits into from
Sep 22, 2020
Merged

Android: Add Wii SYSCONF settings to GUI #9088

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb2e633
Android: Don't assume SliderSetting minimum is 0
JosJuice Sep 16, 2020
9c97654
Config: Add SYSCONF to IsSettingSaveable
JosJuice Sep 16, 2020
6e6446b
Android: Add Wii SYSCONF settings to GUI
JosJuice Sep 16, 2020
7749e8c
Only automatically override SYSCONF settings when it has an effect
JosJuice Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Only automatically override SYSCONF settings when it has an effect 
Any call to Config::SetCurrent will cause the relevant setting
to show up as overridden in the Android GUI, which can be confusing,
so let's not do it when the new value is the same as the original.
  • Loading branch information
@JosJuice
JosJuice committed Sep 16, 2020
commit 7749e8c10c65dfb7c8f31d0e3793bcc143ea9c14
5 changes: 3 additions & 2 deletions Source/Core/Core/BootManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down