diff options
| author | skidau <skidau@gmail.com> | 2014-10-16 14:02:56 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-16 14:02:56 +1100 |
| commit | f27aabd4112069044797d5ffef44dc776dabe72f (patch) | |
| tree | 5cc353923a3662ba766689dd53bd6990d4b19701 /Source/Core/DolphinWX/InputConfigDiag.cpp | |
| parent | 002b9f7acd40786c3859800dc9c69064955c1c3f (diff) | |
| parent | b7b2074cc2e78bb13160372ee82be7f85d0e3772 (diff) | |
Merge pull request #1278 from lioncash/controller
ControllerInterface: Get rid of SetHwnd(), introduce Reinitialize()
Diffstat (limited to 'Source/Core/DolphinWX/InputConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/InputConfigDiag.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 01a3c5e90d..72b33077bb 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -745,8 +745,7 @@ void GamepadPage::RefreshDevices(wxCommandEvent&) std::lock_guard<std::recursive_mutex> lk(m_config.controls_lock); // refresh devices - g_controller_interface.Shutdown(); - g_controller_interface.Initialize(); + g_controller_interface.Reinitialize(); // update all control references m_config_dialog->UpdateControlReferences(); |