The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-18 18:58:55 +02: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

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

@ -35,15 +35,14 @@ QString GetExpressionForControl(const QString& control_name,
}
QString DetectExpression(ControlReference* reference, ciface::Core::Device* device,
const ciface::Core::DeviceQualifier& m_devq,
const ciface::Core::DeviceQualifier& default_device)
{
ciface::Core::Device::Control* const ctrl = reference->Detect(5000, device);
if (ctrl)
{
return MappingCommon::GetExpressionForControl(QString::fromStdString(ctrl->GetName()), m_devq,
default_device);
return MappingCommon::GetExpressionForControl(QString::fromStdString(ctrl->GetName()),
default_device, default_device);
}
return QStringLiteral("");
}