preserve-emulation/RMG
1
0 Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-11-13 09:38:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

RMG-Input: fix handling InputProfileDB with automatic device

Browse Source
This commit is contained in:
Rosalie Wanders committed 2025-10-19 16:51:21 +02:00
1 parent c991721faf
commit 5ccf15b852
3 files changed
+19 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/RMG-Input/UserInterface/MainDialog.cpp
+5 -7
View File
@@ -128,14 +128,14 @@ void MainDialog::openInputDevice(InputDevice device)
{
Widget::ControllerWidget* controllerWidget;
controllerWidget = this->controllerWidgets.at(this->tabWidget->currentIndex());
InputProfileDBEntry inputProfile = {};
// we don't need to open a non-joystick device
if (device.type != InputDeviceType::Automatic &&
device.type != InputDeviceType::Joystick)
{
this->currentDevice = { };
controllerWidget->SetCurrentJoystickID(this->currentDevice.id);
controllerWidget->SetCurrentJoystick(nullptr, nullptr);
controllerWidget->SetCurrentInputDevice(this->currentDevice.id, nullptr, nullptr, inputProfile);
return;
}
@@ -146,12 +146,12 @@ void MainDialog::openInputDevice(InputDevice device)
if (currentIndex < this->inputDeviceList.size())
{ // use device when there's one
device.id = this->inputDeviceList.at(currentIndex).id;
inputProfile = this->inputProfileDB.FindEntry(this->inputDeviceList.at(currentIndex));
}
else
{ // no device found, fallback to keyboard
this->currentDevice = { InputDeviceType::Keyboard, "Keyboard" };
controllerWidget->SetCurrentJoystickID(this->currentDevice.id);
controllerWidget->SetCurrentJoystick(nullptr, nullptr);
controllerWidget->SetCurrentInputDevice(this->currentDevice.id, nullptr, nullptr, inputProfile);
return;
}
}
@@ -170,9 +170,7 @@ void MainDialog::openInputDevice(InputDevice device)
}
this->currentDevice = device;
controllerWidget->SetCurrentJoystickID(device.id);
controllerWidget->SetIsCurrentJoystickGamepad(currentGamepad != nullptr);
controllerWidget->SetCurrentJoystick(this->currentJoystick, this->currentGamepad);
controllerWidget->SetCurrentInputDevice(device.id, this->currentJoystick, this->currentGamepad, inputProfile);
}
void MainDialog::closeInputDevice()