ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6838 from spycrab/qt_map_save 

Qt/ControllersWindow: Fix changing devices while emulation is running
This commit is contained in:
spycrab 2018-05-13 18:17:13 +02:00 committed by GitHub
parent 5564150dd6 2ca75ae05a
commit 17795a615b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt2/Config/ControllersWindow.cpp
View File

@ -297,6 +297,8 @@ void ControllersWindow::OnWiimoteTypeChanged(int type)
return; return;
} }
} }
SaveSettings();
} }
void ControllersWindow::OnGCTypeChanged(int type) void ControllersWindow::OnGCTypeChanged(int type)
@ -312,6 +314,8 @@ void ControllersWindow::OnGCTypeChanged(int type)
return; return;
} }
} }
SaveSettings();
} }
void ControllersWindow::OnBluetoothPassthroughResetPressed() void ControllersWindow::OnBluetoothPassthroughResetPressed()
@ -498,6 +502,9 @@ void ControllersWindow::SaveSettings()
const int index = m_wiimote_boxes[i]->currentIndex(); const int index = m_wiimote_boxes[i]->currentIndex();
g_wiimote_sources[i] = index; g_wiimote_sources[i] = index;
m_wiimote_buttons[i]->setEnabled(index != 0 && index != 2); m_wiimote_buttons[i]->setEnabled(index != 0 && index != 2);
if (Core::IsRunning())
WiimoteReal::ChangeWiimoteSource(static_cast<u32>(i), index);
} }
UICommon::SaveWiimoteSources(); UICommon::SaveWiimoteSources();
@ -507,7 +514,13 @@ void ControllersWindow::SaveSettings()
const int index = m_gc_controller_boxes[i]->currentIndex(); const int index = m_gc_controller_boxes[i]->currentIndex();
const std::optional<SerialInterface::SIDevices> si_device = FromGCMenuIndex(index); const std::optional<SerialInterface::SIDevices> si_device = FromGCMenuIndex(index);
if (si_device) if (si_device)
{
SConfig::GetInstance().m_SIDevice[i] = *si_device; SConfig::GetInstance().m_SIDevice[i] = *si_device;
if (Core::IsRunning())
SerialInterface::ChangeDevice(*si_device, static_cast<s32>(i));
}
m_gc_buttons[i]->setEnabled(index != 0 && index != 6); m_gc_buttons[i]->setEnabled(index != 0 && index != 6);
} }
SConfig::GetInstance().SaveSettings(); SConfig::GetInstance().SaveSettings();