mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-02 13:20:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1945 from skidau/GCPad-Init

Browse Source 
Fixed the GCPad and GCKeyboard getting initialised four times each.
This commit is contained in:
Ryan Houdek 2015-01-22 10:41:43 -06:00
commit bff230fe2e
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/Core.cpp
View File

@ -361,13 +361,8 @@ void EmuThread()
return; return;
} }
for (unsigned int port_num = 0; port_num < 4; port_num++) Keyboard::Initialize(s_window_handle);
{ Pad::Initialize(s_window_handle);
if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_GC_KEYBOARD)
Keyboard::Initialize(s_window_handle);
else
Pad::Initialize(s_window_handle);
}
// Load and Init Wiimotes - only if we are booting in Wii mode // Load and Init Wiimotes - only if we are booting in Wii mode
if (core_parameter.bWii) if (core_parameter.bWii)
@ -483,14 +478,12 @@ void EmuThread()
INFO_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down HW").c_str()); INFO_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down HW").c_str());
HW::Shutdown(); HW::Shutdown();
INFO_LOG(CONSOLE, "%s", StopMessage(false, "HW shutdown").c_str()); 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(); Wiimote::Shutdown();
Keyboard::Shutdown();
Pad::Shutdown();
g_video_backend->Shutdown(); g_video_backend->Shutdown();
AudioCommon::ShutdownSoundStream(); AudioCommon::ShutdownSoundStream();