From 406bb7a54a1b693a32d0a0e46527174f1f190c09 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Wed, 16 Oct 2024 00:28:54 +0100
Subject: [PATCH] Last-minute legacy auto update shims

---
 Bloxstrap/Installer.cs      | 30 ++++++++++++++++++++++++++++--
 Bloxstrap/LaunchSettings.cs |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs
index 1ceaa59..6e7b312 100644
--- a/Bloxstrap/Installer.cs
+++ b/Bloxstrap/Installer.cs
@@ -356,7 +356,10 @@ namespace Bloxstrap
             // 2.0.0 downloads updates to <BaseFolder>/Updates so lol
             bool isAutoUpgrade = App.LaunchSettings.UpgradeFlag.Active
                 || Paths.Process.StartsWith(Path.Combine(Paths.Base, "Updates"))
-                || Paths.Process.StartsWith(Paths.Temp);
+                || Paths.Process.StartsWith(Path.Combine(Paths.LocalAppData, "Temp"))
+                || Paths.Process.StartsWith(Paths.TempUpdates);
+
+            isAutoUpgrade = true;
 
             var existingVer = FileVersionInfo.GetVersionInfo(Paths.Application).ProductVersion;
             var currentVer = FileVersionInfo.GetVersionInfo(Paths.Process).ProductVersion;
@@ -517,6 +520,22 @@ namespace Bloxstrap
 
                 if (Utilities.CompareVersions(existingVer, "2.8.0") == VersionComparison.LessThan)
                 {
+                    if (isAutoUpgrade)
+                    {
+                        Frontend.ShowMessageBox(String.Join(',', App.LaunchSettings.Args.Length));
+
+                        if (App.LaunchSettings.Args.Length == 0)
+                            App.LaunchSettings.RobloxLaunchMode = LaunchMode.Player;
+
+                        string? query = App.LaunchSettings.Args.FirstOrDefault(x => x.Contains("roblox"));
+
+                        if (query is not null)
+                        {
+                            App.LaunchSettings.RobloxLaunchMode = LaunchMode.Player;
+                            App.LaunchSettings.RobloxLaunchArgs = query;
+                        }
+                    }
+
                     string oldDesktopPath = Path.Combine(Paths.Desktop, "Play Roblox.lnk");
                     string oldStartPath = Path.Combine(Paths.WindowsStartMenu, "Bloxstrap");
 
@@ -565,7 +584,14 @@ namespace Bloxstrap
 
                     App.FastFlags.SetValue("FFlagFixGraphicsQuality", null);
 
-                    Directory.Delete(Path.Combine(Paths.Base, "Versions"), true);
+                    try
+                    {
+                        Directory.Delete(Path.Combine(Paths.Base, "Versions"), true);
+                    }
+                    catch (Exception ex)
+                    {
+                        App.Logger.WriteException(LOG_IDENT, ex);
+                    }
                 }
 
                 App.Settings.Save();
diff --git a/Bloxstrap/LaunchSettings.cs b/Bloxstrap/LaunchSettings.cs
index 4250dab..c700d9d 100644
--- a/Bloxstrap/LaunchSettings.cs
+++ b/Bloxstrap/LaunchSettings.cs
@@ -40,7 +40,7 @@ namespace Bloxstrap
 
         public LaunchMode RobloxLaunchMode { get; set; } = LaunchMode.None;
 
-        public string RobloxLaunchArgs { get; private set; } = "";
+        public string RobloxLaunchArgs { get; set; } = "";
 
         /// <summary>
         /// Original launch arguments