Fix task running detection.

Author: Rich Stephens

Tnfsd.NET/MainForm.cs

@@ -134,6 +134,24 @@ private void setTaskRunningState()
             if (this.WindowState == FormWindowState.Minimized)
                 this.Hide();
         }
+
+        private void ShowHourglass(bool show)
+        {
+            if (show)
+            {
+                this.UseWaitCursor = true;
+                Cursor.Current = Cursors.WaitCursor;
+                this.Enabled = false;
+                Application.DoEvents(); // force UI refresh
+            }
+            else
+            {
+                this.UseWaitCursor = false;
+                Cursor.Current = Cursors.Default;
+                this.Enabled = true;
+                Application.DoEvents();
+            }
+        }
         private void MainForm_Load(object sender, EventArgs e)
         {
             var props = TaskSchedulerManager.GetTaskProperties(TaskSchedulerManager.TaskName);
@@ -165,13 +183,17 @@ private void MainForm_Load(object sender, EventArgs e)
 
         private void buttonStartTask_Click(object sender, EventArgs e)
         {
+            ShowHourglass(true);
             TaskSchedulerManager.StartTask(TaskSchedulerManager.TaskName);
+            ShowHourglass(false);
             setTaskRunningState();
         }
 
         private void buttonStopTask_Click(object sender, EventArgs e)
         {
+            ShowHourglass(true);
             TaskSchedulerManager.StopTask(TaskSchedulerManager.TaskName);
+            ShowHourglass(false);
             setTaskRunningState();
         }
 
@@ -194,7 +216,7 @@ private async void buttonCreateTask_Click(object sender, EventArgs e)
 
             try
             {
-                this.UseWaitCursor = true;
+                ShowHourglass(true);
                 buttonCreateTask.Enabled = false;
 
                 TaskSchedulerManager.CreateOrUpdateTask(TaskSchedulerManager.TaskName, exePath, shareFolder);
@@ -204,11 +226,6 @@ private async void buttonCreateTask_Click(object sender, EventArgs e)
                     if (checkBoxAddFirewallException.Checked)
                     {
                         FirewallManager.AddFirewallException(exePath, TaskSchedulerManager.TaskName);
-
-                        if (FirewallManager.FirewallExceptionExists(TaskSchedulerManager.TaskName))
-                        {
-                            MessageBox.Show("Firewall exception created successfully.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                        }
                     }
                 }
 
@@ -229,7 +246,7 @@ private async void buttonCreateTask_Click(object sender, EventArgs e)
             finally
             {
                 buttonCreateTask.Enabled = true;
-                this.UseWaitCursor = false;
+                ShowHourglass(false);
                 setTaskRunningState();
             }
         }
@@ -238,7 +255,7 @@ private async void buttonDeleteTask_Click(object sender, EventArgs e)
         {
             try
             {
-                this.UseWaitCursor = true;
+                ShowHourglass(true);
                 buttonDeleteTask.Enabled = false;
 
                 TaskSchedulerManager.DeleteTask(TaskSchedulerManager.TaskName);
@@ -262,7 +279,7 @@ private async void buttonDeleteTask_Click(object sender, EventArgs e)
             finally
             {
                 buttonDeleteTask.Enabled = true;
-                this.UseWaitCursor = false;
+                ShowHourglass(false);
                 setTaskRunningState();
             }
         }
@@ -295,7 +312,7 @@ private async void buttonDownload_Click(object sender, EventArgs e)
                 {
                     // Continue with download and extraction
                     buttonDownload.Enabled = false;
-                    this.UseWaitCursor = true;
+                    ShowHourglass(true);
 
                     try
                     {
@@ -326,7 +343,7 @@ private async void buttonDownload_Click(object sender, EventArgs e)
                     finally
                     {
                         buttonDownload.Enabled = true;
-                        this.UseWaitCursor = false;
+                        ShowHourglass(false);
                     }
                 }
                 else if (result == DialogResult.No)

Tnfsd.NET/TaskSchedulerManager.cs

@@ -1,6 +1,5 @@
-using System;
-using System.IO;
-using Microsoft.Win32.TaskScheduler;
+using Microsoft.Win32.TaskScheduler;
+using System.Diagnostics;
 
 namespace Tnfsd.NET
 {
@@ -50,6 +49,11 @@ public static void CreateOrUpdateTask(string taskName, string exePath, string ar
 
         public static void DeleteTask(string taskName)
         {
+            if (IsTaskRunning(taskName))
+            {
+                StopTask(taskName);
+            }
+
             using (TaskService ts = new TaskService())
             {
                 var task = ts.GetTask(taskName);
@@ -68,28 +72,55 @@ public static bool TaskExists(string taskName)
 
         public static bool IsTaskRunning(string taskName)
         {
-            using (TaskService ts = new TaskService())
+            using var ts = new TaskService();
+
+            // Always re-fetch to avoid stale state
+            var t = ts.GetTask(taskName) ?? ts.FindTask(taskName, true);
+            if (t == null)
+                return false;
+
+            // 1) Scheduler reports Running
+            if (t.State == TaskState.Running)
+                return true;
+
+            // 2) Check if this task appears in the system's active task list
+            if (ts.GetRunningTasks(true)
+                  .Any(rt => string.Equals(rt.Path, t.Path, System.StringComparison.OrdinalIgnoreCase)))
+                return true;
+
+            // 3) Fallback: detect the actual EXE process from the ExecAction
+            var execPath = (t.Definition.Actions.FirstOrDefault() as ExecAction)?.Path;
+            if (!string.IsNullOrWhiteSpace(execPath))
             {
-                var task = ts.GetTask(taskName);
-                return task != null && task.State == TaskState.Running;
+                var exeName = Path.GetFileNameWithoutExtension(execPath);
+                if (Process.GetProcessesByName(exeName).Any())
+                    return true;
             }
+
+            return false;
         }
 
         public static void StartTask(string taskName)
         {
-            using (TaskService ts = new TaskService())
+            if (TaskExists(taskName))
             {
-                var task = ts.GetTask(taskName);
-                task?.Run();
+                using (TaskService ts = new TaskService())
+                {
+                    var task = ts.GetTask(taskName);
+                    task?.Run();
+                }
             }
         }
 
         public static void StopTask(string taskName)
         {
-            using (TaskService ts = new TaskService())
+            if (TaskExists(taskName))
             {
-                var task = ts.GetTask(taskName);
-                task?.Stop();
+                using (TaskService ts = new TaskService())
+                {
+                    var task = ts.GetTask(taskName);
+                    task?.Stop();
+                }
             }
         }