fix: Fix crashes on Steam close

shdwmtr · Aug 26, 2024 · 4d09aa6 · 4d09aa6
1 parent cdff8ba
commit 4d09aa6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main.cc b/src/main.cc
@@ -102,11 +102,11 @@ int __stdcall DllMain(void*, unsigned long fdwReason, void*)
         case DLL_PROCESS_DETACH: 
         {
             Logger.PrintMessage(" MAIN ", "Shutting down Millennium...", COL_MAGENTA);
+            std::exit(EXIT_SUCCESS);
             g_threadTerminateFlag->flag.store(true);
             Sockets::Shutdown();
             g_millenniumThread->join();
             Logger.PrintMessage(" MAIN ", "Millennium has been shut down.", COL_MAGENTA);
-            //std::this_thread::sleep_for(std::chrono::milliseconds(100000000));
             break;
         }
     }

diff --git a/src/socket/await_pipe.h b/src/socket/await_pipe.h
@@ -22,6 +22,8 @@
 #endif
 #include <procmon/cmd.h>
 
+static bool bHasCheckedConnection = false;
+
 class SocketHelpers
 {
 private:
@@ -183,8 +185,12 @@ class SocketHelpers
     const void VerifySteamConnection()
     {
         #ifndef MILLENNIUM_CLI
-        auto [canConnect, processName] = this->GetSteamConnectionProps();
+        if (bHasCheckedConnection)
+        {
+            return;
+        }
 
+        auto [canConnect, processName] = this->GetSteamConnectionProps();
         if (!canConnect)
         {
             const std::string message = fmt::format(
@@ -199,6 +205,8 @@ class SocketHelpers
             Logger.Warn(message);
             std::exit(1);
         }
+
+        bHasCheckedConnection = true;
         #endif
     }