84ee0779 · Don Gagne · 093f0830 · 84ee0779
Commit 84ee0779 authored Jan 03, 2019 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

Joystick.cc src/Joystick/Joystick.cc +3 -6

No files found.
--- a/src/Joystick/Joystick.cc
+++ b/src/Joystick/Joystick.cc
@@ -520,12 +520,9 @@ void Joystick::run(void)
                        // Button was up last time through, but is now down which indicates a button press
                        qCDebug(JoystickLog) << "button triggered" << buttonIndex;
-                        if (buttonIndex >= _totalButtonCount) {
+                        QString buttonAction =_rgButtonActions[buttonIndex];
-                            // Button is above firmware reserved set
+                        if (!buttonAction.isEmpty()) {
-                            QString buttonAction =_rgButtonActions[buttonIndex];
+                            _buttonAction(buttonAction);
-                            if (!buttonAction.isEmpty()) {
-                                _buttonAction(buttonAction);
-                            }
                        }
                    }