[VMware Launcher 2.0.9.5]

- Refactored code.
- Fixed bug: "#1 Welcome message shows despite VMware not being installed"

VmwareLauncher/Startup.xaml.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Windows;
+using System.Windows;
 
 namespace VMwareLauncher
 {
@@ -17,44 +16,27 @@ namespace VMwareLauncher
         {
             InitializeComponent();
 
-            serviceControl.ServiceList = ServiceControl.DefaultVmwareServices;
+            ProcessControl vmWStationControl = new ProcessControl();
+            vmWStationControl.ProcessName = ProcessControl.DefaultVmwarePath;
 
-            ProcessControl vmwareControl = new ProcessControl();
-            vmwareControl.ProcessName = ProcessControl.DefaultVmwarePath;
+            ProcessControl vmLauncherControl = new ProcessControl();
+            vmLauncherControl.ProcessName = ProcessControl.DefaultVmLauncherPath;
 
-            ProcessControl vmlControl = new ProcessControl();
-            vmlControl.ProcessName = ProcessControl.DefaultVmlPath;
-
-            // Only continue if no errors have been detected.
             checkDependencies.PerformCheck();
-            if (ApplicationControl.BlockingErrors)
-                ApplicationControl.Shutdown();
 
-            if (!vmlControl.IsProcessRunning())
+            // Modify service status to manual.
+            serviceControl.ForceServicesManual();
+
+            if (!vmLauncherControl.IsProcessRunning())
             {
                 statusWindow.Show();
                 trayIcon.Create();
             }
             else
             {
-                vmwareControl.StartProcess();
-                ApplicationControl.Shutdown();
+                vmWStationControl.StartProcess();
+                ApplicationControl.Shutdown(0);
             }
         }
     }
-
-    public static class ApplicationControl
-    {
-        public static bool BlockingErrors { get; set; }
-
-        public static void Shutdown()
-        {
-            Startup.trayIcon.Destroy();
-
-            if (BlockingErrors)
-                Environment.Exit(1);
-            else
-                Environment.Exit(0);
-        }
-    }
 }