Fix SequentialCommandGroup.end logic to match Java

- self._currentCommandIndex must always be set to -1 in end
robotpy · Jan 20, 2024 · d280859 · d280859
1 parent b0b514f
commit d280859
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/commands2/sequentialcommandgroup.py b/commands2/sequentialcommandgroup.py
@@ -66,16 +66,13 @@ def execute(self):
                 self._commands[self._currentCommandIndex].initialize()
 
     def end(self, interrupted: bool):
-        if not interrupted:
-            return
-        if not self._commands:
-            return
-        if not self._currentCommandIndex > -1:
-            return
-        if not self._currentCommandIndex < len(self._commands):
-            return
+        if (
+            interrupted
+            and self._commands
+            and -1 < self._currentCommandIndex < len(self._commands)
+        ):
+            self._commands[self._currentCommandIndex].end(True)
 
-        self._commands[self._currentCommandIndex].end(True)
         self._currentCommandIndex = -1
 
     def isFinished(self) -> bool: