From 9c71f022d5fd336c96f5632914468b9b9fba61ed Mon Sep 17 00:00:00 2001
From: Thomas Jentzsch <tjentzsch@yahoo.de>
Date: Mon, 17 May 2021 23:24:35 +0200
Subject: [PATCH] removed SA erasing and adding in case they are added in ID
 order

---
 src/common/PJoystickHandler.cxx | 17 +++++++++++------
 src/common/PJoystickHandler.hxx |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index 103aa05db..51a79c64e 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -141,20 +141,22 @@ int PhysicalJoystickHandler::add(const PhysicalJoystickPtr& stick)
   // The stick *must* be inserted here, since it may be used below
   mySticks[stick->ID] = stick;
 
+  bool erased = false;
   if(isAdaptor)
   {
     // Map the Stelladaptors we've found according to the specified ports
     // The 'type' is also set there
-    mapStelladaptors(myOSystem.settings().getString("saport"));
+    erased = mapStelladaptors(myOSystem.settings().getString("saport"), stick->ID);
 
-    // We have to add all Stelladaptors again, because they might have changed
+  }
+  if(erased)
+    // We have to add all Stelladaptors again, because they have changed
     // name due to being reordered when mapping them
     for(auto& [_id, _stick] : mySticks)
     {
       if(_stick->name.find(" (emulates ") != std::string::npos)
         addToDatabase(_stick);
     }
-  }
   else
     addToDatabase(stick);
 
@@ -244,8 +246,9 @@ bool PhysicalJoystickHandler::remove(const string& name)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void PhysicalJoystickHandler::mapStelladaptors(const string& saport)
+bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID)
 {
+  bool erased = false;
   // saport will have two values:
   //   'lr' means treat first valid adaptor as left port, second as right port
   //   'rl' means treat first valid adaptor as right port, second as left port
@@ -262,17 +265,18 @@ void PhysicalJoystickHandler::mapStelladaptors(const string& saport)
   for(auto& [_id, _stick]: mySticks)
   {
     bool found = false;
-    // remove previously added emulated ports
     size_t pos = _stick->name.find(" (emulates ");
 
-    if(pos != std::string::npos)
+    if(pos != std::string::npos && ID != -1 && ID < _stick->ID)
     {
+      // Erase a previously added Stelladapter with a higher ID
       ostringstream buf;
       buf << "Erased joystick " << _stick->ID << ":" << endl
         << "  " << _stick->about() << endl;
       Logger::info(buf.str());
 
       _stick->name.erase(pos);
+      erased = true;
     }
 
     if(BSPF::startsWithIgnoreCase(_stick->name, "Stelladaptor"))
@@ -304,6 +308,7 @@ void PhysicalJoystickHandler::mapStelladaptors(const string& saport)
     }
   }
   myOSystem.settings().setValue("saport", saport);
+  return erased;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/common/PJoystickHandler.hxx b/src/common/PJoystickHandler.hxx
index 1cdc2d1f8..bebc3efe0 100644
--- a/src/common/PJoystickHandler.hxx
+++ b/src/common/PJoystickHandler.hxx
@@ -70,7 +70,7 @@ class PhysicalJoystickHandler
     int add(const PhysicalJoystickPtr& stick);
     bool remove(int id);
     bool remove(const string& name);
-    void mapStelladaptors(const string& saport);
+    bool mapStelladaptors(const string& saport, int ID = -1);
     bool hasStelladaptors() const;
     void setDefaultMapping(Event::Type type, EventMode mode);