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

MappingWindow: don't store devq separately from controller default device

Browse Source
This commit is contained in:
Michael M
2017-11-04 15:29:15 -07:00
parent 9551fe1c73
commit ac855e2c93
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,6 @@ void MappingWindow::OnSaveProfilePressed()
void MappingWindow::OnDeviceChanged(int index)
{
const auto device = m_devices_combo->currentText().toStdString();
m_devq.FromString(device);
m_controller->SetDefaultDevice(device);
}
@ -316,14 +315,9 @@ ControllerEmu::EmulatedController* MappingWindow::GetController() const
return m_controller;
}
const ciface::Core::DeviceQualifier& MappingWindow::GetDeviceQualifier() const
{
return m_devq;
}
std::shared_ptr<ciface::Core::Device> MappingWindow::GetDevice() const
{
return g_controller_interface.FindDevice(m_devq);
return g_controller_interface.FindDevice(GetController()->GetDefaultDevice());
}
void MappingWindow::OnDefaultFieldsPressed()