From 9551fe1c736fe514d0c70f01c67df9dd89ce501e Mon Sep 17 00:00:00 2001 From: Michael M Date: Sun, 19 Nov 2017 12:35:41 -0800 Subject: MappingWindow: m_controller is never nullptr Since GCPadWiiUConfigDialog was made its own class, m_controller will never be nullptr. --- Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp index 3a83b27479..7089c3944d 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp @@ -298,8 +298,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type) m_profiles_combo->addItem(QString::fromStdString(basename), QString::fromStdString(filename)); } - if (m_controller != nullptr) - RefreshDevices(); + RefreshDevices(); } void MappingWindow::AddWidget(const QString& name, QWidget* widget) @@ -329,9 +328,6 @@ std::shared_ptr MappingWindow::GetDevice() const void MappingWindow::OnDefaultFieldsPressed() { - if (m_controller == nullptr) - return; - m_controller->LoadDefaults(g_controller_interface); m_controller->UpdateReferences(g_controller_interface); emit Update(); -- cgit v1.2.3 From ac855e2c93319622d644a99ab5f2ece012338fff Mon Sep 17 00:00:00 2001 From: Michael M Date: Sat, 4 Nov 2017 15:29:15 -0700 Subject: MappingWindow: don't store devq separately from controller default device --- Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp') 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 MappingWindow::GetDevice() const { - return g_controller_interface.FindDevice(m_devq); + return g_controller_interface.FindDevice(GetController()->GetDefaultDevice()); } void MappingWindow::OnDefaultFieldsPressed() -- cgit v1.2.3