Merge pull request JMRI#12166 from Lionel642/master

Fix issue when advanced consist address is the same as the head loc
kiwi64ajs · Jul 8, 2023 · 124bd3b · 124bd3b
2 parents 4623216 + 46730ea
commit 124bd3b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/java/src/jmri/jmrit/throttle/AddressPanel.java b/java/src/jmri/jmrit/throttle/AddressPanel.java
@@ -366,7 +366,11 @@ public void notifyConsistThrottleFound(DccThrottle t) {
         if (consist != null && consist.getConsistType() == Consist.ADVANCED_CONSIST) {      
             // request a throttle for head locomotive for functions
             DccLocoAddress headLocoAddress = consist.getConsistList().get(0);
-            changeOfAddress(headLocoAddress);
+            // only if consist address is not head locomotive address
+            if (! headLocoAddress.equals(currentAddress)) {
+                log.debug("Advanced consist throttle, requesting secondary throttle for head locomotive function control.");
+                changeOfAddress(headLocoAddress);
+            }
         }
     }