Merge pull request #200 from N1Ran/master

loop fix

Author: N1Ran

Essentials/AutoCommand.cs

@@ -31,6 +31,7 @@ public class AutoCommand : ViewModel
         private string _name;
         private float _triggerRatio;
         private double _triggerCount;
+        private bool _isRunning;
 
         [XmlIgnore]
         public bool Completed { get; set; }
@@ -201,24 +202,22 @@ internal async void RunNow()
         {
             _cTokenSource = new CancellationTokenSource();
             var token = _cTokenSource.Token;
-            
+            _isRunning = true;
             await Task.Run(() =>
             {
-                while (!token.IsCancellationRequested)
+                foreach (var step in Steps)
                 {
-                    foreach (var step in Steps)
+                    if (token.IsCancellationRequested)
                     {
-                        if (token.IsCancellationRequested)
-                        {
-                            break;
-                        }
-                        step.RunStep();
-                        Thread.Sleep(step.DelaySpan);
+                        break;
                     }
+                    step.RunStep();
+                    Thread.Sleep(step.DelaySpan);
                 }
             }, token);
 
             _cTokenSource.Dispose();
+            _isRunning = false;
         }
 
         internal void Cancel()
@@ -238,7 +237,7 @@ public override string ToString()
 
         internal bool IsRunning()
         {
-            return _currentStep > 0 || _cTokenSource != null && _cTokenSource?.IsCancellationRequested == false;
+            return _currentStep > 0 || _isRunning;
         }
     }
 

Essentials/AutoCommands.cs

@@ -47,7 +47,7 @@ private bool CanRun(AutoCommand command)
                 case Trigger.Disabled:
                     return  false;
                 case Trigger.OnStart:
-                    if (command.Completed)break;
+                    if (command.Completed || command.IsRunning())break;
                     command.Completed = true;
                     command.RunNow();
                     break;