Improve MLC run state resetting

Fixes #9

Previously if an error occurred when trying to force kill mlc.exe,
the stored process ID would not reset and the user cannot run
another test. Now, we will always set the process ID to -1 after
attempting to kill MLC regardless of the result.

Author: FarisR99

IMLCGui/MLCProcess.cs

@@ -169,12 +169,12 @@ public Process StartProcess(string arguments)
 
         public bool Stop()
         {
-            bool retVal = false;
+            bool stopped = false;
             if (this.CancellationTokenSource != null && !this.CancellationTokenSource.IsCancellationRequested)
             {
                 this.CancellationTokenSource.Cancel();
                 this.CancellationTokenSource = null;
-                retVal = true;
+                stopped = true;
                 try
                 {
                     Thread.Sleep(250);
@@ -196,16 +196,12 @@ public bool Stop()
                         Process runningProcess = Process.GetProcessById(this.ProcessId);
                         if (runningProcess != null && !runningProcess.HasExited)
                         {
-                            if (!runningProcess.HasExited)
+                            string processName = runningProcess.ProcessName;
+                            runningProcess.Kill();
+                            runningProcess.WaitForExit();
+                            if (this._logger != null)
                             {
-                                string processName = runningProcess.ProcessName;
-                                runningProcess.Kill();
-                                runningProcess.WaitForExit();
-                                if (this._logger != null)
-                                {
-                                    this._logger.Log($"Killed process: {processName}");
-                                }
-                                this.ProcessId = -1;
+                                this._logger.Log($"Killed process: {processName}");
                             }
                         }
                         else
@@ -214,7 +210,6 @@ public bool Stop()
                             {
                                 this._logger.Log("Killed MLC.");
                             }
-                            this.ProcessId = -1;
                         }
                     }
                     catch (Exception ex)
@@ -224,10 +219,14 @@ public bool Stop()
                             this._logger.Error("Failed to kill MLC process:", ex);
                         }
                     }
-                    retVal = true;
+                    finally
+                    {
+                        this.ProcessId = -1;
+                    }
+                    stopped = true;
                 }
             }
-            return retVal;
+            return stopped;
         }
     }
 }

IMLCGui/MainWindow.xaml.cs

@@ -46,6 +46,8 @@ public partial class MainWindow : MetroWindow
         private MLCProcess _mlcProcess;
         private AutoUpdater autoUpdater;
 
+        private bool runningTest = false;
+
         public MainWindow()
         {
             this._logger = new Logger("imlcgui.log");
@@ -305,7 +307,11 @@ private void HandleMLCButton(Action resetUI, string logMessage, Action taskActio
         {
             if (this._mlcProcess.Stop())
             {
-                return;
+                if (this.runningTest)
+                {
+                    this.runningTest = false;
+                    return;
+                }
             }
             string validationResult = ValidateMLC();
             if (validationResult != null)
@@ -314,15 +320,15 @@ private void HandleMLCButton(Action resetUI, string logMessage, Action taskActio
                 return;
             }
 
-            if (resetUI != null)
-            {
-                resetUI();
-            }
-
+            this.runningTest = true;
             if (logMessage != null)
             {
                 this._logger.Log(logMessage);
             }
+            if (resetUI != null)
+            {
+                resetUI();
+            }
 
             this._mlcProcess.CancellationTokenSource = new CancellationTokenSource();
             Task.Run(taskAction, this._mlcProcess.CancellationTokenSource.Token);
@@ -436,6 +442,7 @@ private void TxtBoxQuickLatency_DoubleClick(object sender, RoutedEventArgs e)
 
         private void ResetQuickRunButton()
         {
+            this.runningTest = false;
             this.BtnQuickRun.Invoke(() =>
             {
                 this.BtnQuickRun.Content = "Run";
@@ -545,6 +552,7 @@ private void BtnBandwidthRun_Click(object sender, RoutedEventArgs e)
 
         private void ResetBandwidthRunButton()
         {
+            this.runningTest = false;
             this.BtnBandwidthRun.Invoke(() =>
             {
                 this.BtnBandwidthRun.Content = "Run";
@@ -698,6 +706,7 @@ private void BtnLatencyRun_Click(object sender, RoutedEventArgs e)
 
         private void ResetLatencyRunButton()
         {
+            this.runningTest = false;
             this.BtnLatencyRun.Invoke(() =>
             {
                 this.BtnLatencyRun.Content = "Run";
@@ -846,6 +855,7 @@ private void BtnCacheRun_Click(object sender, RoutedEventArgs e)
 
         private void ResetCacheRunButton()
         {
+            this.runningTest = false;
             this.BtnCacheRun.Invoke(() =>
             {
                 this.BtnCacheRun.Content = "Run";

IMLCGui/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]