From c9a858a86512842aa98e96de2a466aeaa3905c7d Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 23 Feb 2022 19:23:49 +0100 Subject: [PATCH] minor fix for Global Hotkeys and Stelladaptors --- src/common/PJoystickHandler.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx index 2003cbe27..1a35cef63 100644 --- a/src/common/PJoystickHandler.cxx +++ b/src/common/PJoystickHandler.cxx @@ -265,7 +265,6 @@ bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID) erased = true; } - //if(BSPF::startsWithIgnoreCase(_stick->name, "Stelladaptor")) if(BSPF::containsIgnoreCase(_stick->name, "Stelladaptor")) { if(saOrder[saCount] == 1) @@ -274,8 +273,7 @@ bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID) _stick->type = PhysicalJoystick::Type::RIGHT_STELLADAPTOR; found = true; } - else //if(BSPF::startsWithIgnoreCase(_stick->name, "2600-daptor")) - if(BSPF::containsIgnoreCase(_stick->name, "2600-daptor")) + else if(BSPF::containsIgnoreCase(_stick->name, "2600-daptor")) { if(saOrder[saCount] == 1) _stick->type = PhysicalJoystick::Type::LEFT_2600DAPTOR; @@ -310,8 +308,8 @@ bool PhysicalJoystickHandler::hasStelladaptors() const if(pos != std::string::npos) _joyptr->name.erase(pos); - if(BSPF::startsWithIgnoreCase(_joyptr->name, "Stelladaptor") - || BSPF::startsWithIgnoreCase(_joyptr->name, "2600-daptor")) + if(BSPF::containsIgnoreCase(_joyptr->name, "Stelladaptor") + || BSPF::containsIgnoreCase(_joyptr->name, "2600-daptor")) return true; } return false;