mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-19 19:15:01 +00:00
Merge pull request #13496 from TryTwo/PR_GameSettings_Fix
Game config settings: Show global value when no game setting exists.
This commit is contained in:
commit
056b0339be
1 changed files with 9 additions and 1 deletions
|
@ -76,8 +76,16 @@ protected:
|
||||||
template <typename T>
|
template <typename T>
|
||||||
const T ReadValue(const Config::Info<T>& setting) const
|
const T ReadValue(const Config::Info<T>& setting) const
|
||||||
{
|
{
|
||||||
|
// For loading game specific settings. If the game setting doesn't exist, load the current
|
||||||
|
// global setting. There's no way to know what game is being edited, so GlobalGame settings
|
||||||
|
// can't be shown, but otherwise would be good to include.
|
||||||
if (m_layer != nullptr)
|
if (m_layer != nullptr)
|
||||||
return m_layer->Get(setting);
|
{
|
||||||
|
if (m_layer->Exists(m_location))
|
||||||
|
return m_layer->Get(setting);
|
||||||
|
else
|
||||||
|
return Config::GetBase(setting);
|
||||||
|
}
|
||||||
|
|
||||||
return Config::Get(setting);
|
return Config::Get(setting);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue