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/DolphinWX/NetPlay/NetWindow.cpp | |
| parent | 5ae1c07cd4a06f3738e461785bc364667dfd9129 (diff) | |
| parent | c375111076235313669e71953c877c9512cebd16 (diff) | |
Merge pull request #2594 from degasus/master
Options: merge SCoreStartupParameter into SConfig
Diffstat (limited to 'Source/Core/DolphinWX/NetPlay/NetWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 2658aea656..6a9a8e5a8c 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -28,7 +28,6 @@ #include "Common/IniFile.h" #include "Core/ConfigManager.h" -#include "Core/CoreParameter.h" #include "Core/NetPlayClient.h" #include "Core/NetPlayProto.h" #include "Core/NetPlayServer.h" @@ -251,9 +250,9 @@ void NetPlayDialog::OnChat(wxCommandEvent&) void NetPlayDialog::GetNetSettings(NetSettings &settings) { SConfig &instance = SConfig::GetInstance(); - settings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread; - settings.m_CPUcore = instance.m_LocalCoreStartupParameter.iCPUCore; - settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; + settings.m_CPUthread = instance.bCPUThread; + settings.m_CPUcore = instance.iCPUCore; + settings.m_DSPHLE = instance.bDSPHLE; settings.m_DSPEnableJIT = instance.m_DSPEnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); settings.m_OCEnable = instance.m_OCEnable; |