From 48822bdc582ac9deb6a03249f5e48f5088a002c6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:00:29 -0300
Subject: [PATCH] Attempt to fix CrashHandler odd issues

---
 src/plugins/crashHandler/index.ts | 52 ++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index b73641f57..f8c76d7f7 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -57,6 +57,7 @@ const settings = definePluginSettings({
 });
 
 let hasCrashedOnce = false;
+let isRecovering = false;
 let shouldAttemptRecover = true;
 
 export default definePlugin({
@@ -71,38 +72,49 @@ export default definePlugin({
         {
             find: ".Messages.ERRORS_UNEXPECTED_CRASH",
             replacement: {
-                match: /(?=this\.setState\()/,
-                replace: "$self.handleCrash(this);"
+                match: /this\.setState\((.+?)\)/,
+                replace: "$self.handleCrash(this,$1);"
             }
         }
     ],
 
-    handleCrash(_this: any) {
+    handleCrash(_this: any, errorState: any) {
+        _this.setState(errorState);
+
+        // Already recovering, prevent error which happens more than once too fast to trigger another recover
+        if (isRecovering) return;
+        isRecovering = true;
+
         // 1 ms timeout to avoid react breaking when re-rendering
         setTimeout(() => {
-            if (!shouldAttemptRecover) {
-                try {
-                    showNotification({
-                        color: "#eed202",
-                        title: "Discord has crashed!",
-                        body: "Awn :( Discord has crashed two times rapidly, not attempting to recover.",
-                        noPersist: true,
-                    });
-                } catch { }
+            try {
+                // Prevent a crash loop with an error that could not be handled
+                if (!shouldAttemptRecover) {
+                    try {
+                        showNotification({
+                            color: "#eed202",
+                            title: "Discord has crashed!",
+                            body: "Awn :( Discord has crashed two times rapidly, not attempting to recover.",
+                            noPersist: true
+                        });
+                    } catch { }
 
-                return;
-            }
+                    return;
+                }
 
-            shouldAttemptRecover = false;
-            // This is enough to avoid a crash loop
-            setTimeout(() => shouldAttemptRecover = true, 500);
+                shouldAttemptRecover = false;
+                // This is enough to avoid a crash loop
+                setTimeout(() => shouldAttemptRecover = true, 500);
+            } catch { }
 
             try {
                 if (!hasCrashedOnce) {
                     hasCrashedOnce = true;
                     maybePromptToUpdate("Uh oh, Discord has just crashed... but good news, there is a Vencord update available that might fix this issue! Would you like to update now?", true);
                 }
+            } catch { }
 
+            try {
                 if (settings.store.attemptToPreventCrashes) {
                     this.handlePreventCrash(_this);
                 }
@@ -118,7 +130,7 @@ export default definePlugin({
                 color: "#eed202",
                 title: "Discord has crashed!",
                 body: "Attempting to recover...",
-                noPersist: true,
+                noPersist: true
             });
         } catch { }
 
@@ -169,6 +181,10 @@ export default definePlugin({
             }
         }
 
+
+        // Set isRecovering to false before setting the state to allow us to handle the next crash error correcty, in case it happens
+        setImmediate(() => isRecovering = false);
+
         try {
             _this.setState({ error: null, info: null });
         } catch (err) {