From 61813da917315cc0edeeb7a1dd7ebd2363301d7d Mon Sep 17 00:00:00 2001
From: pa <maplenagisa@gmail.com>
Date: Mon, 5 Jan 2026 20:35:16 +0900
Subject: [PATCH] fix: theme fallback issue

---
 src/components/NavMenu.vue        | 14 --------------
 src/shared/utils/base/ui.js       |  2 ++
 src/stores/settings/appearance.js |  6 ++++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/components/NavMenu.vue b/src/components/NavMenu.vue
index 98a87726..45e44642 100644
--- a/src/components/NavMenu.vue
+++ b/src/components/NavMenu.vue
@@ -204,20 +204,6 @@
                                                 ✓
                                             </span>
                                         </button>
-
-                                        <el-divider></el-divider>
-
-                                        <div class="nav-menu-theme__custom">
-                                            <span class="nav-menu-theme__custom-label">{{
-                                                t('view.settings.appearance.theme_color.header')
-                                            }}</span>
-                                            <el-color-picker
-                                                :model-value="currentPrimary"
-                                                size="small"
-                                                :disabled="isApplyingPrimaryColor"
-                                                :teleported="false"
-                                                @change="handleCustomThemeColorChange" />
-                                        </div>
                                     </div>
                                     <template #reference>
                                         <button type="button" class="nav-menu-theme__item" @click.prevent>
diff --git a/src/shared/utils/base/ui.js b/src/shared/utils/base/ui.js
index c131f248..9bac63f4 100644
--- a/src/shared/utils/base/ui.js
+++ b/src/shared/utils/base/ui.js
@@ -78,6 +78,8 @@ function changeAppThemeStyle(themeMode) {
         // load system theme as fallback
         themeMode = systemIsDarkMode() ? 'dark' : 'light';
         themeConfig = THEME_CONFIG[themeMode];
+        const appSettingsStore = useAppearanceSettingsStore();
+        appSettingsStore.setThemeMode(themeMode);
     }
 
     const cssFiles = Array.isArray(themeConfig.cssFiles)
diff --git a/src/stores/settings/appearance.js b/src/stores/settings/appearance.js
index 40fd1d7d..c0f93e13 100644
--- a/src/stores/settings/appearance.js
+++ b/src/stores/settings/appearance.js
@@ -211,7 +211,6 @@ export const useAppearanceSettingsStore = defineStore(
 
             themeMode.value = normalizedThemeMode;
             applyThemeMode();
-            await changeAppThemeStyle(themeMode.value);
             await initPrimaryColor();
 
             displayVRCPlusIconsAsAvatar.value =
@@ -462,6 +461,7 @@ export const useAppearanceSettingsStore = defineStore(
             configRepository.setString('VRCX_ThemeMode', normalizedThemeMode);
             applyThemeMode();
         }
+
         function applyThemeMode() {
             if (themeMode.value === 'light') {
                 setIsDarkMode(false);
@@ -471,6 +471,7 @@ export const useAppearanceSettingsStore = defineStore(
                 setIsDarkMode(true);
             }
         }
+
         /**
          * @param {boolean} isDark
          */
@@ -878,7 +879,8 @@ export const useAppearanceSettingsStore = defineStore(
             setNotificationIconDot,
             applyCompactTableMode,
             setNavCollapsed,
-            toggleNavCollapsed
+            toggleNavCollapsed,
+            setThemeMode
         };
     }
 );