From 57cae6f9f16aa50e48e2367f53352ddf3e25ccb8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 6 Feb 2025 04:13:03 +0100
Subject: [PATCH] Settings should be wrapped in ErrorBoundary

---
 src/renderer/components/settings/Settings.tsx | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/settings/Settings.tsx b/src/renderer/components/settings/Settings.tsx
index 95dd647..792f447 100644
--- a/src/renderer/components/settings/Settings.tsx
+++ b/src/renderer/components/settings/Settings.tsx
@@ -6,6 +6,7 @@
 
 import "./settings.css";
 
+import { ErrorBoundary } from "@vencord/types/components";
 import { Forms, Switch, Text } from "@vencord/types/webpack/common";
 import { ComponentType } from "react";
 import { Settings, useSettings } from "renderer/settings";
@@ -155,14 +156,20 @@ function SettingsSections() {
     return <>{sections}</>;
 }
 
-export default function SettingsUi() {
-    return (
-        <Forms.FormSection>
-            <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
-                Vesktop Settings
-            </Text>
+export default ErrorBoundary.wrap(
+    function SettingsUI() {
+        return (
+            <Forms.FormSection>
+                <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
+                    Vesktop Settings
+                </Text>
 
-            <SettingsSections />
-        </Forms.FormSection>
-    );
-}
+                <SettingsSections />
+            </Forms.FormSection>
+        );
+    },
+    {
+        message:
+            "Failed to render the Vesktop Settings tab. If this issue persists, try to right click the Vesktop tray icon, then click 'Repair Vencord'. And make sure your Vesktop is up to date."
+    }
+);