The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6167 from ligfx/encapsulatedefaultdevice

Browse Source 
EmulatedController: encapsulate default device behind getters/setters
This commit is contained in:
Leo Lam
2017-11-11 17:11:56 +01:00
committed by GitHub
parent 338bffd1e7 1b1dd1d749
commit 1e24a5f309
8 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ void MappingWindow::OnDeviceChanged(int index)
{
const auto device = m_devices_combo->currentText().toStdString();
m_devq.FromString(device);
m_controller->default_device.FromString(device);
m_controller->SetDefaultDevice(device);
}
void MappingWindow::RefreshDevices()
@ -221,9 +221,8 @@ void MappingWindow::RefreshDevices()
Core::RunAsCPUThread([&] {
g_controller_interface.RefreshDevices();
m_controller->UpdateReferences(g_controller_interface);
m_controller->UpdateDefaultDevice();
const auto default_device = m_controller->default_device.ToString();
const auto default_device = m_controller->GetDefaultDevice().ToString();
m_devices_combo->addItem(QString::fromStdString(default_device));