diff --git a/src/Joystick/JoystickManager.cc b/src/Joystick/JoystickManager.cc index 2b29e0082a50ef5a36380d59c8b52a929d09ec4e..530b0573d80d821c56d0c08432c0696385ad2a87 100644 --- a/src/Joystick/JoystickManager.cc +++ b/src/Joystick/JoystickManager.cc @@ -106,14 +106,14 @@ void JoystickManager::_setActiveJoystickFromSettings(void) } QSettings settings; - + settings.beginGroup(_settingsGroup); QString name = settings.value(_settingsKeyActiveJoystick).toString(); - + if (name.isEmpty()) { name = _name2JoystickMap.first()->name(); } - + setActiveJoystick(_name2JoystickMap.value(name, _name2JoystickMap.first())); settings.setValue(_settingsKeyActiveJoystick, _activeJoystick->name()); } @@ -139,9 +139,9 @@ void JoystickManager::setActiveJoystick(Joystick* joystick) if (_activeJoystick) { _activeJoystick->stopPolling(); } - + _activeJoystick = joystick; - + if (_activeJoystick != nullptr) { qCDebug(JoystickManagerLog) << "Set active:" << _activeJoystick->name(); @@ -156,11 +156,11 @@ void JoystickManager::setActiveJoystick(Joystick* joystick) QVariantList JoystickManager::joysticks(void) { QVariantList list; - + for (const QString &name: _name2JoystickMap.keys()) { list += QVariant::fromValue(_name2JoystickMap[name]); } - + return list; } @@ -180,7 +180,7 @@ void JoystickManager::setActiveJoystickName(const QString& name) qCWarning(JoystickManagerLog) << "Set active not in map" << name; return; } - + setActiveJoystick(_name2JoystickMap[name]); }