Merge pull request #816 from Wartori54/everest-splash-fixes-4

Fix different failure checks in StopSplash
EverestAPI · Sep 7, 2024 · 643142e · 643142e
1 parent 932a971
commit 643142e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Celeste.Mod.mm/Mod/Everest/EverestSplashHandler.cs b/Celeste.Mod.mm/Mod/Everest/EverestSplashHandler.cs
@@ -145,7 +145,10 @@ public static void StopSplash() {
                     Environment.SetEnvironmentVariable("EVEREST_SKIP_REQUEST_FOCUS_AFTER_SPLASH", "1");
                 }
                 if (splashPipeServerStream == null) return; // If the splash never ran, no-op
-                if (!splashPipeServerStreamConnection.IsCompleted || !lastFlush.IsCompletedSuccessfully) {
+                if (!splashPipeServerStreamConnection.IsCompleted // Exact same checks from `SendMessageToSplash`
+                    || !splashPipeServerStream.IsConnected 
+                    || (lastFlush != null && 
+                        !lastFlush.IsCompletedSuccessfully)) {
                     Logger.Error("EverestSplash", "Could not connect to splash");
                     if (!splashProcess.HasExited) { // if it hangs up, just kill it
                         splashProcess.Kill();