Decor: Prevent more crashes

Vendicated · Nov 12, 2024 · 7ef536c · 7ef536c
1 parent 69dc4fd
commit 7ef536c
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/src/plugins/decor/lib/stores/UsersDecorationsStore.ts b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
@@ -99,19 +99,28 @@ export function useUserDecorAvatarDecoration(user?: User): AvatarDecoration | nu
         const [decorAvatarDecoration, setDecorAvatarDecoration] = useState<string | null>(user ? useUsersDecorationsStore.getState().getAsset(user.id) ?? null : null);
 
         useEffect(() => {
-            const destructor = useUsersDecorationsStore.subscribe(
-                state => {
-                    if (!user) return;
-                    const newDecorAvatarDecoration = state.getAsset(user.id);
-                    if (!newDecorAvatarDecoration) return;
-                    if (decorAvatarDecoration !== newDecorAvatarDecoration) setDecorAvatarDecoration(newDecorAvatarDecoration);
+            const destructor = (() => {
+                try {
+                    return useUsersDecorationsStore.subscribe(
+                        state => {
+                            if (!user) return;
+                            const newDecorAvatarDecoration = state.getAsset(user.id);
+                            if (!newDecorAvatarDecoration) return;
+                            if (decorAvatarDecoration !== newDecorAvatarDecoration) setDecorAvatarDecoration(newDecorAvatarDecoration);
+                        }
+                    );
+                } catch {
+                    return () => { };
                 }
-            );
+            })();
+
+            try {
+                if (user) {
+                    const { fetch: fetchUserDecorAvatarDecoration } = useUsersDecorationsStore.getState();
+                    fetchUserDecorAvatarDecoration(user.id);
+                }
+            } catch { }
 
-            if (user) {
-                const { fetch: fetchUserDecorAvatarDecoration } = useUsersDecorationsStore.getState();
-                fetchUserDecorAvatarDecoration(user.id);
-            }
             return destructor;
         }, []);