piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved the GC Adapter processing under "Standard Controller" as it appears the adapter does not work with controllers other than the standard controller (pads, bongos, some dance mats).

Browse Source
This commit is contained in:
skidau
2014-12-11 14:06:35 +11:00
parent 8fdd04e647
commit 30b34f3b2e
6 changed files with 93 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinWX/ControllerConfigDiag.cpp
View File

@ -104,22 +104,8 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateGamecubeSizer()
if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive())
pad_type_choices[i]->Disable();
SIDevices selected_device = SConfig::GetInstance().m_SIDevice[i];
#if defined(__LIBUSB__) || defined (_WIN32)
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
SI_GCAdapter::RefreshConnectedDevices();
if (SI_GCAdapter::GetDeviceType(i) != SIDEVICE_NONE)
{
pad_type_choices[i]->Disable();
selected_device = SI_GCAdapter::GetDeviceType(i);
}
}
#endif
// Set the saved pad type as the default choice.
switch (selected_device)
switch (SConfig::GetInstance().m_SIDevice[i])
{
case SIDEVICE_GC_CONTROLLER:
pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[1]);