diff options
| author | Michael M <mchtly@gmail.com> | 2017-11-04 15:29:15 -0700 |
|---|---|---|
| committer | Michael M <mchtly@gmail.com> | 2017-11-19 12:46:39 -0800 |
| commit | ac855e2c93319622d644a99ab5f2ece012338fff (patch) | |
| tree | 3b1b73c50baa6ef1d05f70c69872458137d7a9b7 /Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | |
| parent | 9551fe1c736fe514d0c70f01c67df9dd89ce501e (diff) | |
MappingWindow: don't store devq separately from controller default device
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp index 7089c3944d..18d22b706d 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp @@ -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() |