diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-08-11 15:48:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 15:48:27 +0800 |
| commit | d89698898abeda018dc2b8896f00bc46f036f36b (patch) | |
| tree | caa950a3158c587786f271bb5202a84170658a28 /Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp | |
| parent | e86f5ac04b156aabf3555b453f4fabc1909f8281 (diff) | |
| parent | 940cc843ed99cacf58472566e7ef766432550d4f (diff) | |
Merge pull request #5876 from leoetlino/sysconf-onion
Config: Port SYSCONF and parts of Movie to new config system
Diffstat (limited to 'Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp index aeee5f9b4f..fffd25685a 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp @@ -23,7 +23,9 @@ #include <sstream> #include "Common/CommonPaths.h" +#include "Common/Config/Config.h" #include "Common/TraversalClient.h" +#include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/NetPlayServer.h" @@ -224,8 +226,8 @@ void NetPlayDialog::OnStart() settings.m_EnableCheats = instance.bEnableCheats; settings.m_SelectedLanguage = instance.SelectedLanguage; settings.m_OverrideGCLanguage = instance.bOverrideGCLanguage; - settings.m_ProgressiveScan = instance.bProgressive; - settings.m_PAL60 = instance.bPAL60; + settings.m_ProgressiveScan = Config::Get(Config::SYSCONF_PROGRESSIVE_SCAN); + settings.m_PAL60 = Config::Get(Config::SYSCONF_PAL60); settings.m_DSPHLE = instance.bDSPHLE; settings.m_DSPEnableJIT = instance.m_DSPEnableJIT; settings.m_WriteToMemcard = m_save_sd_box->isChecked(); |