diff options
| author | skidau <skidau@gmail.com> | 2015-07-15 11:29:37 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-07-15 11:29:37 +1000 |
| commit | 41bdaece5ef31a6fd31785ff79f6a54aa9728202 (patch) | |
| tree | ef3bc5c6846299278e4a674c7a7ae0397e466019 /Source/Core/DolphinWX/ControllerConfigDiag.cpp | |
| parent | a12a4520d8b677c160108a8e8ce93d8c937219d7 (diff) | |
| parent | cae00254a5c6c1d177b13552243613a92bf37738 (diff) | |
Merge pull request #2744 from mathieui/gcadapter-stopthread
GCAdapter: Disable the scanning thread when direct connect is disabled
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index ff5bafc44e..170439f1f5 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -174,6 +174,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateGamecubeSizer() m_adapter_status->SetLabelText(_("Driver Not Detected")); gamecube_adapter->Disable(); gamecube_adapter->SetValue(false); + gamecube_rumble->Disable(); } } else |