From 82da36dd685c68b09047d7c835175879edb68653 Mon Sep 17 00:00:00 2001
From: Thomas Jentzsch <tjentzsch@yahoo.de>
Date: Tue, 20 Dec 2022 11:07:53 +0100
Subject: [PATCH] fixed two bugs regarding Joy2B+ controller

---
 src/emucore/Control.cxx          | 2 +-
 src/emucore/GlobalKeyHandler.cxx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx
index ae049d0dd..777c5e81e 100644
--- a/src/emucore/Control.cxx
+++ b/src/emucore/Control.cxx
@@ -127,7 +127,7 @@ string Controller::getPropName(const Type type)
     "AMIGAMOUSE", "ATARIMOUSE", "ATARIVOX", "BOOSTERGRIP", "COMPUMATE",
     "DRIVING", "GENESIS", "JOYSTICK", "KEYBOARD", "KIDVID", "MINDLINK",
     "PADDLES", "PADDLES_IAXIS", "PADDLES_IAXDR", "SAVEKEY", "TRAKBALL",
-    "LIGHTGUN", "QUADTARI", "JOY2B+"
+    "LIGHTGUN", "QUADTARI", "JOY_2B+"
   };
 
   return PROP_NAMES[static_cast<int>(type)];
diff --git a/src/emucore/GlobalKeyHandler.cxx b/src/emucore/GlobalKeyHandler.cxx
index 04b87f360..07fd51371 100644
--- a/src/emucore/GlobalKeyHandler.cxx
+++ b/src/emucore/GlobalKeyHandler.cxx
@@ -169,6 +169,7 @@ bool GlobalKeyHandler::isJoystick(const Controller& controller)
   return controller.type() == Controller::Type::Joystick
     || controller.type() == Controller::Type::BoosterGrip
     || controller.type() == Controller::Type::Genesis
+    || controller.type() == Controller::Type::Joy2BPlus
     || (controller.type() == Controller::Type::QuadTari
       && (isJoystick(static_cast<const QuadTari*>(&controller)->firstController())
       || isJoystick(static_cast<const QuadTari*>(&controller)->secondController())));