Minor improvement for live trading shutdown

QuantConnect · Sep 19, 2024 · 7c42ea7 · 7c42ea7
1 parent f2f1d06
commit 7c42ea7
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Engine/AlgorithmManager.cs b/Engine/AlgorithmManager.cs
@@ -48,6 +48,7 @@ public class AlgorithmManager
         private IAlgorithm _algorithm;
         private readonly object _lock;
         private readonly bool _liveMode;
+        private bool _cancelRequested;
         private CancellationTokenSource _cancellationTokenSource;
 
         /// <summary>
@@ -612,13 +613,20 @@ public void SetStatus(AlgorithmStatus state)
                     _algorithm.SetStatus(state);
                 }
 
-                if (state == AlgorithmStatus.Deleted)
+                if (!_cancellationTokenSource.IsCancellationRequested && !_cancelRequested)
                 {
-                    if (!_cancellationTokenSource.IsCancellationRequested)
+                    if (state == AlgorithmStatus.Deleted)
                     {
-                        // if the algorithm was deleted or stopped, let's give the algorithm a few seconds to shutdown and cancel it out
+                        _cancelRequested = true;
+                        // if the algorithm was deleted, let's give the algorithm a few seconds to shutdown and cancel it out
                         _cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(5));
                     }
+                    else if (state == AlgorithmStatus.Stopped)
+                    {
+                        _cancelRequested = true;
+                        // if the algorithm was stopped, let's give the algorithm a few seconds to shutdown and cancel it out
+                        _cancellationTokenSource.CancelAfter(TimeSpan.FromMinutes(1));
+                    }
                 }
             }
         }