From ca28a5f54918b144a72183c4247297c84d65a69d Mon Sep 17 00:00:00 2001
From: 49fl <ircsurfer33@gmail.com>
Date: Wed, 7 Aug 2024 20:44:33 -0400
Subject: [PATCH] Fix settings derp and app start project theme loading (#3320)

* Fix settings opening and messing up everything

* Set settings aggressively for startup project theme loading

* fmt

---------

Co-authored-by: Lee <lee@Lees-Mac-mini.local>
---
 src/components/LowerRightControls.tsx | 2 +-
 src/hooks/useSetupEngineManager.ts    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/LowerRightControls.tsx b/src/components/LowerRightControls.tsx
index f4c8c70f0..c271b0b40 100644
--- a/src/components/LowerRightControls.tsx
+++ b/src/components/LowerRightControls.tsx
@@ -88,7 +88,7 @@ export function LowerRightControls({
         <Link
           to={
             location.pathname.includes(paths.FILE)
-              ? filePath + paths.SETTINGS
+              ? filePath + paths.SETTINGS + '?tab=project'
               : paths.HOME + paths.SETTINGS
           }
         >
diff --git a/src/hooks/useSetupEngineManager.ts b/src/hooks/useSetupEngineManager.ts
index 588579210..b432d15bb 100644
--- a/src/hooks/useSetupEngineManager.ts
+++ b/src/hooks/useSetupEngineManager.ts
@@ -105,6 +105,8 @@ export function useSetupEngineManager(
   }, [immediateState])
 
   useEffect(() => {
+    engineCommandManager.settings.theme = settings.theme
+
     const handleResize = deferExecution(() => {
       const { width, height } = getDimensions(
         streamRef?.current?.offsetWidth ?? 0,