diff options
| author | Matthew Parlane <parlane@gmail.com> | 2016-07-13 18:56:23 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 18:56:23 +1200 |
| commit | 3f9a98ddf2a77aa9ec2ed3d987cdf7aca25901b9 (patch) | |
| tree | ec9dab9fd7f4ff07c789df6da9f89f9ecbde88ee /Source/Core/DolphinWX/ControllerConfigDiag.cpp | |
| parent | ebf10d38ddc7367a4debb9987c0ef7f6ff152a12 (diff) | |
| parent | ce9622c42652c0207801b5c20702569802a07f91 (diff) | |
Merge pull request #3979 from JosJuice/use-g_want_determinism
Use g_want_determinism more
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 8a0de34024..3d8d12bbef 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -98,7 +98,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateGamecubeSizer() pad_type_choices[i]->Bind(wxEVT_CHOICE, &ControllerConfigDiag::OnGameCubePortChanged, this); // Disable controller type selection for certain circumstances. - if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive()) + if (Core::g_want_determinism) pad_type_choices[i]->Disable(); // Set the saved pad type as the default choice. @@ -179,7 +179,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer() // Disable controller type selection for certain circumstances. bool wii_game_started = SConfig::GetInstance().bWii || Core::GetState() == Core::CORE_UNINITIALIZED; - if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || !wii_game_started) + if (Core::g_want_determinism || !wii_game_started) wiimote_source_ch[i]->Disable(); m_orig_wiimote_sources[i] = g_wiimote_sources[i]; |