From 92dd25ac250472a272ca7f97f7e3477847ce0cc0 Mon Sep 17 00:00:00 2001
From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com>
Date: Tue, 3 Jan 2023 13:25:12 +0000
Subject: [PATCH] Fix app disabling launching games page incorrectly

---
 Bloxstrap/Bootstrapper.cs | 11 +++++++----
 Bloxstrap/Program.cs      |  9 +++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index 463dce9e..aa65d62d 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -12,6 +12,7 @@
 using Bloxstrap.Helpers.RSMM;
 using Bloxstrap.Models;
 using System.Net;
+using Bloxstrap.Properties;
 
 namespace Bloxstrap
 {
@@ -179,6 +180,12 @@ private async Task StartRoblox()
 
             Dialog.Message = "Starting Roblox...";
 
+            if (LaunchCommandLine == "--app" && Program.Settings.UseDisableAppPatch)
+            {
+                Utilities.OpenWebsite("https://www.roblox.com/games");
+                return;
+            }
+
             // launch time isn't really required for all launches, but it's usually just safest to do this
             LaunchCommandLine += " --launchtime=" + DateTimeOffset.Now.ToUnixTimeMilliseconds();
 
@@ -218,10 +225,6 @@ private async Task StartRoblox()
                 await Task.Delay(3000);
 
                 // now we move onto handling rich presence
-                // this is going to be an issue for desktop app launches as this gets the place id from the command line,
-                // but the desktop app launch can switch games without having to close the client
-                // i might be able to experiment with reading from the latest log file in realtime to circumvent this,
-                // but i have no idea how reliable it will be. todo?
                 if (Program.Settings.UseDiscordRichPresence)
                 {
                     richPresence = new DiscordRichPresence();
diff --git a/Bloxstrap/Program.cs b/Bloxstrap/Program.cs
index 49b97244..05a326fe 100644
--- a/Bloxstrap/Program.cs
+++ b/Bloxstrap/Program.cs
@@ -136,7 +136,7 @@ static void Main(string[] args)
 
             string commandLine = "";
 
-#if DEBUG
+#if false //DEBUG
             new Preferences().ShowDialog();
 #else
             if (args.Length > 0)
@@ -161,15 +161,12 @@ static void Main(string[] args)
                 }
                 else
                 {
-                    commandLine = String.Join(" ", args);
+                    commandLine = "--app";
                 }
             }
             else
             {
-                if (Settings.UseDisableAppPatch)
-                    Utilities.OpenWebsite("https://www.roblox.com/games");
-                else
-                    commandLine = "--app";
+                commandLine = "--app";
             }
 #endif