fix stop task

Author: vinaghost

TbsCore/Core/TaskExecutor.cs

@@ -25,7 +25,7 @@ public static async Task PageLoaded(Account acc)
             if (IsCaptcha(acc) || IsWWMsg(acc) || IsBanMsg(acc) || IsMaintanance(acc)) //Check if a captcha/ban/end of server/maintanance
             {
                 acc.Logger.Warning("Captcha/WW/Ban/Maintanance found! Stopping bot for this account!");
-                acc.TaskTimer.ForceTimerStop();
+                acc.TaskTimer.Stop();
             }
             if (CheckCookies(acc))
                 await DriverHelper.ExecuteScript(acc, "document.getElementById('CybotCookiebotDialogBodyLevelButtonLevelOptinDeclineAll').click();");
@@ -92,7 +92,7 @@ public static async Task Execute(Account acc, BotTask task)
                     var result = await acc.Wb.Init(acc);
                     if (!result)
                     {
-                        acc.TaskTimer.ForceTimerStop();
+                        acc.TaskTimer.Stop();
                         return;
                     }
                 }

TbsCore/Core/TaskTimer.cs

@@ -14,13 +14,6 @@ public sealed class TaskTimer : IDisposable
         private readonly Random _random;
         private readonly Account _acc;
         private readonly Timer _mainTimer;
-        private bool flagStopTimer;
-
-        public void ForceTimerStop()
-        {
-            _acc.Status = Status.Stopping;
-            flagStopTimer = true;
-        }
 
         private long _isTaskExcuting;
 
@@ -63,21 +56,25 @@ public void Start()
             if (IsBotRunning) return;
             IsBotRunning = true;
             IsTaskExcuting = false;
-            flagStopTimer = false;
             _mainTimer.Start();
         }
 
-        public async Task Stop(bool force = false)
+        public void Stop()
         {
             if (!IsBotRunning) return;
 
             IsBotRunning = false;
             _mainTimer.Stop();
 
-            if (!force)
-            {
-                await Task.Run(() => { while (IsTaskExcuting) { } });
-            }
+            var currentTask = _acc.Tasks.CurrentTask;
+            if (currentTask != null) currentTask.StopFlag = true;
+            _acc.Status = Status.Pausing;
+        }
+
+        public async Task WaitStop()
+        {
+            await Task.Run(() => { while (IsTaskExcuting) { } });
+            _acc.Status = Status.Paused;
         }
 
         private void MainTimerElapsed(object source, ElapsedEventArgs e) => NewTick();
@@ -86,12 +83,6 @@ private async void NewTick()
         {
             if (!IsBotRunning) return;
             if (IsTaskExcuting) return;
-            if (flagStopTimer)
-            {
-                await Stop(true);
-                _acc.Status = Status.Offline;
-                return;
-            }
             IsTaskExcuting = true;
 
             if (_acc.Tasks.Count == 0)

TbsCore/Extensions/AccountExtension.cs

@@ -20,13 +20,5 @@ public static bool CanLogout(this Account acc)
             if (acc.Status == Status.Online) return true;
             return false;
         }
-
-        public static async Task Stop(this Account acc)
-        {
-            if (acc.Status == Status.Offline) return;
-            acc.Status = Status.Stopping;
-            await acc.TaskTimer.Stop();
-            acc.Status = Status.Offline;
-        }
     }
 }

TbsCore/Helpers/IoHelperCore.cs

@@ -190,8 +190,11 @@ public static async Task<bool> Login(Account acc)
         /// <param name="acc"></param>
         public static async Task Logout(Account acc)
         {
-            await acc.TaskTimer.Stop();
+            acc.TaskTimer.Stop();
+            await acc.TaskTimer.WaitStop();
+            acc.Status = Status.Stopping;
             acc.Wb.Close();
+            acc.Status = Status.Offline;
         }
     }
 }

TbsCore/Models/AccModels/TaskList.cs

@@ -152,6 +152,11 @@ public BotTask FirstTask
             get => _tasks.FirstOrDefault();
         }
 
+        public BotTask CurrentTask
+        {
+            get => _tasks.FirstOrDefault(x => x.Stage == TaskStage.Executing);
+        }
+
         public void Save()
         {
             var list = new List<TaskFileModel>();

TbsCore/Tasks/LowLevel/LoginTask.cs

@@ -35,7 +35,7 @@ public override async Task<TaskRes> Execute(Account acc)
             {
                 // Wrong password/nickname
                 acc.Logger.Warning("Password is incorrect!");
-                acc.TaskTimer.ForceTimerStop();
+                acc.TaskTimer.Stop();
             }
             else
             {

TbsCore/Tasks/LowLevel/ReopenDriver.cs

@@ -50,7 +50,7 @@ public override async Task<TaskRes> Execute(Account acc)
             var result = await acc.Wb.Init(acc, ChangeAccess);
             if (!result)
             {
-                acc.TaskTimer.ForceTimerStop();
+                acc.TaskTimer.Stop();
             }
 
             return TaskRes.Executed;

TravBotSharp/Views/GeneralUc.cs

@@ -234,10 +234,9 @@ private void button6_Click(object sender, EventArgs e) // Stop timers
             }
             var thread = new Thread(async () =>
             {
-                acc.Status = Status.Pausing;
+                acc.TaskTimer.Stop();
                 UpdateBotRunning();
-                await acc.TaskTimer.Stop();
-                acc.Status = Status.Paused;
+                await acc.TaskTimer.WaitStop();
                 UpdateBotRunning();
             });
             thread.Start();