diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-22 10:41:43 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-22 10:41:43 -0600 |
| commit | bff230fe2eea2b4a07c35be64647ac931d3f339a (patch) | |
| tree | 3a5da9c32d287d263f56c8e3306f73ec7e6e08f8 /Source/Core | |
| parent | bb1ca26c57445c6d66f0016562f21f56efce6ffc (diff) | |
| parent | 6ad5d4681a6155a03f5b45a6566ed1fee0590d15 (diff) | |
Merge pull request #1945 from skidau/GCPad-Init
Fixed the GCPad and GCKeyboard getting initialised four times each.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Core.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 7a61e41bda..2ca4942921 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -361,13 +361,8 @@ void EmuThread() return; } - for (unsigned int port_num = 0; port_num < 4; port_num++) - { - if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_GC_KEYBOARD) - Keyboard::Initialize(s_window_handle); - else - Pad::Initialize(s_window_handle); - } + Keyboard::Initialize(s_window_handle); + Pad::Initialize(s_window_handle); // Load and Init Wiimotes - only if we are booting in Wii mode if (core_parameter.bWii) @@ -483,14 +478,12 @@ void EmuThread() INFO_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down HW").c_str()); HW::Shutdown(); INFO_LOG(CONSOLE, "%s", StopMessage(false, "HW shutdown").c_str()); - for (unsigned int port_num = 0; port_num < 4; port_num++) - { - if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_GC_KEYBOARD) - Keyboard::Shutdown(); - else - Pad::Shutdown(); - } + Wiimote::Shutdown(); + + Keyboard::Shutdown(); + Pad::Shutdown(); + g_video_backend->Shutdown(); AudioCommon::ShutdownSoundStream(); |