Fix potential bug in install checker

UB would occur if installer.CheckInstallLocation() failed when attempting to change the install location
pizzaboxer · Sep 9, 2024 · 356155c · 356155c
1 parent 6206411
commit 356155c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -198,28 +198,33 @@ protected override void OnStartup(StartupEventArgs e)
  }
  }
 
+ if (fixInstallLocation && installLocation is not null)
+ {
+ var installer = new Installer
+ {
+ InstallLocation = installLocation,
+ IsImplicitInstall = true
+ };
+
+ if (installer.CheckInstallLocation())
+ {
+ Logger.WriteLine(LOG_IDENT, $"Changing install location to '{installLocation}'");
+ installer.DoInstall();
+ }
+ else
+ {
+ // force reinstall
+ installLocation = null;
+ }
+ }
+
  if (installLocation is null)
  {
  Logger.Initialize(true);
  LaunchHandler.LaunchInstaller();
  }
  else
  {
- if (fixInstallLocation)
- {
- var installer = new Installer
- {
- InstallLocation = installLocation,
- IsImplicitInstall = true
- };
-
- if (installer.CheckInstallLocation())
- {
- Logger.WriteLine(LOG_IDENT, $"Changing install location to '{installLocation}'");
- installer.DoInstall();
- }
- }
-
  Paths.Initialize(installLocation);
 
  // ensure executable is in the install directory
@@ -246,10 +251,8 @@ protected override void OnStartup(StartupEventArgs e)
 
  Locale.Set(Settings.Prop.Locale);
 
-#if !DEBUG
  if (!LaunchSettings.BypassUpdateCheck)
  Installer.HandleUpgrade();
-#endif
 
  LaunchHandler.ProcessLaunchArgs();
  }

diff --git a/Bloxstrap/LaunchSettings.cs b/Bloxstrap/LaunchSettings.cs
@@ -28,7 +28,11 @@ public class LaunchSettings
 
  public LaunchFlag StudioFlag { get; } = new("studio");
 
+#if DEBUG
+ public bool BypassUpdateCheck => true;
+#else
  public bool BypassUpdateCheck => UninstallFlag.Active || WatcherFlag.Active;
+#endif
 
  public LaunchMode RobloxLaunchMode { get; set; } = LaunchMode.None;