fix (partially) #494 (ToDo: Stelladaptor)

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
   {

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;

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