diff options
| author | Markus Wick <markus@selfnet.de> | 2015-06-12 22:42:45 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-06-12 22:42:45 +0200 |
| commit | 740e34484704c64bf95b2143e9601a8834cbe8db (patch) | |
| tree | 4008bc8648422c51521a65b5209d0b641e9aea07 /Source/Core/VideoCommon/VideoConfig.cpp | |
| parent | 5ae1c07cd4a06f3738e461785bc364667dfd9129 (diff) | |
| parent | c375111076235313669e71953c877c9512cebd16 (diff) | |
Merge pull request #2594 from degasus/master
Options: merge SCoreStartupParameter into SConfig
Diffstat (limited to 'Source/Core/VideoCommon/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 699318cc87..92abca4819 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -144,7 +144,7 @@ void VideoConfig::GameIniLoad() } \ } while (0) - IniFile iniFile = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni(); + IniFile iniFile = SConfig::GetInstance().LoadGameIni(); CHECK_SETTING("Video_Hardware", "VSync", bVSync); |