From f2b299cc9c5c8703148dcbe916ebb8d0839fe276 Mon Sep 17 00:00:00 2001
From: sethburkart123 <seth.burkart@hills.adventist.edu.au>
Date: Thu, 31 Oct 2024 17:05:30 +1100
Subject: [PATCH] fix: colourpicker state not loading correctly

---
 src/svelte-interface/components/ColourPicker.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/svelte-interface/components/ColourPicker.tsx b/src/svelte-interface/components/ColourPicker.tsx
index 585bb13b..c21c3fd1 100644
--- a/src/svelte-interface/components/ColourPicker.tsx
+++ b/src/svelte-interface/components/ColourPicker.tsx
@@ -1,5 +1,5 @@
 import ColorPicker from "react-best-gradient-color-picker"
-import React, { useEffect, useRef, useState } from "react"
+import { useEffect, useRef, useState } from "react"
 import { settingsState } from "@/seqta/utils/listeners/SettingsState.ts"
 
 const defaultPresets = [
@@ -41,7 +41,7 @@ export default function Picker({
   const latestValuesRef = useRef({ customThemeColor, customOnChange, savePresets, presets });
 
   useEffect(() => {
-    if (customState !== undefined) {
+    if (customState !== undefined && customState !== null) {
       setCustomThemeColor(customState)
     } else {
       setCustomThemeColor(settingsState.selectedColor ?? null)
@@ -53,12 +53,6 @@ export default function Picker({
     }
   }, [])
 
-  useEffect(() => {
-    if (customState !== undefined) {
-      setCustomThemeColor(customState)
-    }
-  }, [customState])
-
   useEffect(() => {
     latestValuesRef.current = { customThemeColor, customOnChange, savePresets, presets };
   }, [customThemeColor, customOnChange, savePresets, presets]);