From 055e75cfbed4f87a257fe972196638b195c60493 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Thu, 20 Apr 2023 13:30:29 +0100
Subject: [PATCH] Formatting fixes, bump version

---
 Bloxstrap/App.xaml.cs              | 5 ++---
 Bloxstrap/Bloxstrap.csproj         | 4 ++--
 Bloxstrap/Bootstrapper.cs          | 5 ++++-
 Bloxstrap/Helpers/DeployManager.cs | 1 +
 Bloxstrap/Models/State.cs          | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
index fac8054..6446109 100644
--- a/Bloxstrap/App.xaml.cs
+++ b/Bloxstrap/App.xaml.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using System.Net;
 using System.Reflection;
@@ -332,10 +333,8 @@ namespace Bloxstrap
 
                     // we've got ownership of the roblox singleton mutex!
                     // if we stop running, everything will screw up once any more roblox instances launched
-                    while (Utilities.GetProcessCount("RobloxPlayerBeta", false) != 0)
-                    {
+                    while (Process.GetProcessesByName("RobloxPlayerBeta").Any())
                         Thread.Sleep(5000);
-                    }
                 }
             }
 
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
index d3e7baa..bec8aa9 100644
--- a/Bloxstrap/Bloxstrap.csproj
+++ b/Bloxstrap/Bloxstrap.csproj
@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
-    <Version>2.1.0</Version>
-    <FileVersion>2.1.0.0</FileVersion>
+    <Version>2.2.0</Version>
+    <FileVersion>2.2.0.0</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index ae01a8a..52aa707 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -247,7 +247,7 @@ namespace Bloxstrap
             int gameClientPid;
             using (Process gameClient = Process.Start(_playerLocation, _launchCommandLine))
             {
-				gameClientPid = gameClient.Id;
+                gameClientPid = gameClient.Id;
             }
 
             List<Process> autocloseProcesses = new();
@@ -819,6 +819,9 @@ namespace Bloxstrap
 
                 if (App.FastFlags.GetValue(FastFlagManager.RenderingModes["Direct3D 11"]) == "True" && App.FastFlags.GetValue("FFlagHandleAltEnterFullscreenManually") != "False")
                     App.FastFlags.SetRenderingMode("Automatic");
+
+                // this is just in case something ever changes, i doubt it but lol
+                App.State.Prop.HadReShadeInstalled = true;
             }
         }
 
diff --git a/Bloxstrap/Helpers/DeployManager.cs b/Bloxstrap/Helpers/DeployManager.cs
index a745cd7..2f88c9d 100644
--- a/Bloxstrap/Helpers/DeployManager.cs
+++ b/Bloxstrap/Helpers/DeployManager.cs
@@ -80,6 +80,7 @@ namespace Bloxstrap.Helpers
         public static readonly List<string> SelectableChannels = new()
         {
             "LIVE",
+            "ZWinPlayer64",
             "ZFlag",
             "ZNext",
             "ZCanary",
diff --git a/Bloxstrap/Models/State.cs b/Bloxstrap/Models/State.cs
index f1eb02e..3fb6648 100644
--- a/Bloxstrap/Models/State.cs
+++ b/Bloxstrap/Models/State.cs
@@ -9,6 +9,7 @@ namespace Bloxstrap.Models
     public class State
     {
         public string VersionGuid { get; set; } = "";
+        public bool HadReShadeInstalled { get; set; } = false;
         public List<string> ModManifest { get; set; } = new();
     }
 }