From b21a821ccc649f98c37d55edce8069b10c8419c8 Mon Sep 17 00:00:00 2001
From: Thomas Jentzsch <tjentzsch@yahoo.de>
Date: Thu, 15 Aug 2019 09:32:01 +0200
Subject: [PATCH] fix (partially) #494 (ToDo: Stelladaptor)

---
 src/common/PJoystickHandler.cxx | 1 +
 src/emucore/EventHandler.hxx    | 1 -
 src/gui/EventMappingWidget.cxx  | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index 7554ba26f..c16c4a2ac 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -117,6 +117,7 @@ int PhysicalJoystickHandler::add(PhysicalJoystickPtr stick)
   {
     it->second.joy = stick;
     stick->setMap(it->second.mapping);
+    enableEmulationMappings();
   }
   else // adding for the first time
   {
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index b173a77a3..fd3b0e083 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -177,7 +177,6 @@ class EventHandler
       return myPKeyHandler->getMappingDesc(event, mode);
     }
 
-
     Event::Type eventAtIndex(int idx, EventMode mode) const;
     string actionAtIndex(int idx, EventMode mode) const;
     string keyAtIndex(int idx, EventMode mode) const;
diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx
index a08c0d455..06759f26e 100644
--- a/src/gui/EventMappingWidget.cxx
+++ b/src/gui/EventMappingWidget.cxx
@@ -131,6 +131,9 @@ void EventMappingWidget::loadConfig()
     myActionsList->setSelected(0);
     myFirstTime = false;
   }
+  else
+    // controller IDs may have changed in between
+    drawKeyMapping();
 
   // Make sure remapping is turned off, just in case the user didn't properly
   // exit last time