Merge pull request #149 from PhantomGamers/dev

Author: PhantomGamers

SFP/Models/Injection/Injector.cs

@@ -229,6 +229,11 @@ private static async Task ProcessFrame(Frame frame)
             foreach (var patch in patches)
             {
                 var regex = patch.MatchRegexString;
+                if (title == "SharedJSContext" && !regex.Contains("SharedJSContext"))
+                {
+                    // only inject into SharedJSContext when it is explicitly desired
+                    continue;
+                }
                 if (regex.StartsWith('.') || regex.StartsWith('#') || regex.StartsWith('['))
                 {
                     try

SFP/Models/Steam.cs

@@ -196,19 +196,7 @@ public static Task StartSteam(string? args = null)
         }
 
         args ??= Settings.Default.SteamLaunchArgs.Trim();
-        const string DebuggingString = @"-cef-enable-debugging";
-        if (!args.Contains(DebuggingString))
-        {
-            args += $" {DebuggingString}";
-            args = args.Trim();
-        }
-
-        const string BootstrapString = @"-skipinitialbootstrap";
-        if (OperatingSystem.IsMacOS() && !args.Contains(BootstrapString))
-        {
-            args += $" {BootstrapString}";
-            args = args.Trim();
-        }
+        AppendArgs(ref args);
 
         if (OperatingSystem.IsWindows() && File.Exists(MillenniumPath))
         {
@@ -395,12 +383,7 @@ private static async Task<bool> CheckForMissingArgumentsAsync()
         }
 
         var args = Settings.Default.SteamLaunchArgs.Trim().ToLower();
-        const string DebuggingString = @"-cef-enable-debugging";
-        if (!args.Split(' ', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).Contains(DebuggingString))
-        {
-            args += $" {DebuggingString}";
-            args = args.Trim();
-        }
+        AppendArgs(ref args);
 
         var argumentMissing = args.Split(' ', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
             .Any(arg => !cmdLine.Contains(arg));
@@ -415,4 +398,23 @@ private static async Task<bool> CheckForMissingArgumentsAsync()
         await RestartSteam();
         return true;
     }
+
+    private static void AppendArgs(ref string args)
+    {
+        const string DebuggingString = @"-cef-enable-debugging";
+        const string BootstrapString = @"-skipinitialbootstrap";
+        var argsList = args.Split(' ', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList();
+
+        if (!argsList.Contains(DebuggingString))
+        {
+            argsList.Add(DebuggingString);
+        }
+
+        if (OperatingSystem.IsMacOS() && !argsList.Contains(BootstrapString))
+        {
+            argsList.Add(BootstrapString);
+        }
+
+        args = string.Join(" ", argsList);
+    }
 }

SFP_UI/Program.cs

@@ -39,8 +39,15 @@ public static void Main(string[] args)
         SetupNLog();
         Log.Logger.Info(
             $"Initializing SFP version {UpdateChecker.Version} on platform {RuntimeInformation.RuntimeIdentifier}");
-        InitSettings();
-        _ = BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnExplicitShutdown);
+        try
+        {
+            InitSettings();
+            _ = BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnExplicitShutdown);
+        }
+        catch (Exception e)
+        {
+            Log.Logger.Error(e);
+        }
         CloseFileStream();
     }
 
@@ -132,5 +139,6 @@ private static void OnUnhandledException(object sender, UnhandledExceptionEventA
     {
         Log.Logger.Error(e.ExceptionObject);
         LogManager.Shutdown();
+        CloseFileStream();
     }
 }