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 #5462 from spycrab/qt_refresh_devices 

Qt: Fix default device handling
This commit is contained in:
Anthony 2017-05-21 13:29:11 -07:00 committed by GitHub
parent 1072da11fe 6370f094ba
commit e328b13ae2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
View File

@ -54,7 +54,7 @@ GetExpressionForControl(const QString& control_name,
void MappingButton::OnButtonPressed() void MappingButton::OnButtonPressed()
{ {
if (m_block) if (m_block || m_parent->GetDevice() == nullptr)
return; return;
// Make sure that we don't block event handling // Make sure that we don't block event handling

6
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
View File

@ -211,7 +211,9 @@ void MappingWindow::OnSaveProfilePressed()
void MappingWindow::OnDeviceChanged(int index) void MappingWindow::OnDeviceChanged(int index)
{ {
m_devq.FromString(m_devices_combo->currentText().toStdString()); const auto device = m_devices_combo->currentText().toStdString();
m_devq.FromString(device);
m_controller->default_device.FromString(device);
} }
void MappingWindow::RefreshDevices() void MappingWindow::RefreshDevices()
@ -234,6 +236,8 @@ void MappingWindow::RefreshDevices()
m_devices_combo->addItem(QString::fromStdString(name)); m_devices_combo->addItem(QString::fromStdString(name));
} }
m_devices_combo->setCurrentIndex(0);
Core::PauseAndLock(false, paused); Core::PauseAndLock(false, paused);
} }