From 28bcf57dff18c88255daff8c879e2aae6659cf43 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Mon, 26 Jun 2023 22:06:40 +0100
Subject: [PATCH] Re-enable desktop app if launching with deeplink

---
 Bloxstrap/App.xaml.cs                       | 3 +++
 Bloxstrap/Bootstrapper.cs                   | 2 +-
 Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
index d49ad31..2890972 100644
--- a/Bloxstrap/App.xaml.cs
+++ b/Bloxstrap/App.xaml.cs
@@ -253,6 +253,9 @@ namespace Bloxstrap
                 }
                 else if (LaunchArgs[0].StartsWith("roblox:"))
                 {
+                    if (Settings.Prop.UseDisableAppPatch)
+                        ShowMessageBox("Roblox was launched via a deeplink, however the desktop app is required for deeplink launching to work. Because you've opted to disable the desktop app, it will temporarily be re-enabled for this launch only.", MessageBoxImage.Information);
+
                     commandLine = $"--app --deeplink {LaunchArgs[0]}";
                 }
                 else
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index 79f78f1..a52d885 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -955,7 +955,7 @@ namespace Bloxstrap
             await CheckModPreset(App.Settings.Prop.UseOldCharacterSounds, @"content\sounds\action_jump_land.mp3", "Empty.mp3");
             await CheckModPreset(App.Settings.Prop.UseOldCharacterSounds, @"content\sounds\action_swim.mp3", "Empty.mp3");
             await CheckModPreset(App.Settings.Prop.UseOldCharacterSounds, @"content\sounds\impact_water.mp3", "Empty.mp3");
-            await CheckModPreset(App.Settings.Prop.UseDisableAppPatch, @"ExtraContent\places\Mobile.rbxl", "");
+            await CheckModPreset(App.Settings.Prop.UseDisableAppPatch && !_launchCommandLine.Contains("--deeplink"), @"ExtraContent\places\Mobile.rbxl", "");
 
             // emoji presets are downloaded remotely from github due to how large they are
             string emojiFontLocation = Path.Combine(Directories.Modifications, "content\\fonts\\TwemojiMozilla.ttf");
diff --git a/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml
index 57dd470..7c801c4 100644
--- a/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml
@@ -103,7 +103,7 @@
         <ui:CardControl.Header>
           <StackPanel>
             <TextBlock FontSize="14" Text="Disable desktop app" />
-            <TextBlock Margin="0,2,0,0" FontSize="12" Text="Stops the desktop app from showing. Keep in mind that this breaks deeplinking." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+            <TextBlock Margin="0,2,0,0" FontSize="12" Text="Stops the desktop app from showing, especially when you leave a game." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
           </StackPanel>
         </ui:CardControl.Header>
         <ui:ToggleSwitch IsChecked="{Binding DisableAppPatchEnabled, Mode=TwoWay}" />