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/ControllerConfigDiag.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/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 7514e6e091..07b803b677 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -235,7 +235,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer() wiimote_configure_bt[i]->Bind(wxEVT_BUTTON, &ControllerConfigDiag::ConfigEmulatedWiimote, this); // Disable controller type selection for certain circumstances. - bool wii_game_started = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii || Core::GetState() == Core::CORE_UNINITIALIZED; + bool wii_game_started = SConfig::GetInstance().bWii || Core::GetState() == Core::CORE_UNINITIALIZED; if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || !wii_game_started) wiimote_source_ch[i]->Disable(); |