From ec418261ea25b3560c480caaa1b8130fe85cdd2b Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Thu, 27 Jun 2024 18:08:17 +0400
Subject: [PATCH] Fix inconsistent handling of desktop app closing

---
 Bloxstrap/Integrations/ActivityWatcher.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Bloxstrap/Integrations/ActivityWatcher.cs b/Bloxstrap/Integrations/ActivityWatcher.cs
index 19e1182..2e5d39d 100644
--- a/Bloxstrap/Integrations/ActivityWatcher.cs
+++ b/Bloxstrap/Integrations/ActivityWatcher.cs
@@ -134,6 +134,14 @@
             else if (_logEntriesRead % 100 == 0)
                 App.Logger.WriteLine(LOG_IDENT, $"Read {_logEntriesRead} log entries");
 
+
+            if (App.Settings.Prop.UseDisableAppPatch && entry.Contains(GameLeavingEntry))
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Received desktop app exit, closing Roblox");
+                using var process = Process.GetProcessById(_gameClientPid);
+                process.CloseMainWindow();
+            }
+
             if (!ActivityInGame && ActivityPlaceId == 0)
             {
                 if (entry.Contains(GameJoiningPrivateServerEntry))
@@ -209,13 +217,7 @@
             }
             else if (ActivityInGame && ActivityPlaceId != 0)
             {
-                if (App.Settings.Prop.UseDisableAppPatch && entry.Contains(GameLeavingEntry))
-                {
-                    App.Logger.WriteLine(LOG_IDENT, "Received desktop app exit, closing Roblox");
-                    using var process = Process.GetProcessById(_gameClientPid);
-                    process.CloseMainWindow();
-                }
-                else if (entry.Contains(GameDisconnectedEntry))
+                if (entry.Contains(GameDisconnectedEntry))
                 {
                     App.Logger.WriteLine(LOG_IDENT, $"Disconnected from Game ({ActivityPlaceId}/{ActivityJobId}/{ActivityMachineAddress})");