From 56f4990bd48d169e8aaf451c000b02521357c23b Mon Sep 17 00:00:00 2001
From: pa <maplenagisa@gmail.com>
Date: Mon, 27 Oct 2025 23:27:52 +0900
Subject: [PATCH] fix sentry reporting toggle issue

---
 src/components/NavMenu.vue      |  7 +++++--
 src/stores/settings/advanced.js | 13 ++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/NavMenu.vue b/src/components/NavMenu.vue
index fea11745..79cccfba 100644
--- a/src/components/NavMenu.vue
+++ b/src/components/NavMenu.vue
@@ -35,7 +35,7 @@
 
         <div class="nav-menu-container-bottom">
             <el-tooltip v-if="branch === 'Nightly'" :content="'Feedback'" placement="right"
-                ><div class="direct-access" id="feedback">
+                ><div class="direct-access" id="feedback" @click="setSentryErrorReporting">
                     <i class="ri-feedback-line"></i></div
             ></el-tooltip>
             <el-tooltip :content="t('prompt.direct_access_omni.header')" placement="right"
@@ -50,7 +50,7 @@
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
-    import { useSearchStore, useUiStore, useVRCXUpdaterStore } from '../stores';
+    import { useAdvancedSettingsStore, useSearchStore, useUiStore, useVRCXUpdaterStore } from '../stores';
 
     import * as Sentry from '@sentry/vue';
 
@@ -78,8 +78,11 @@
     const uiStore = useUiStore();
     const { notifiedMenus } = storeToRefs(uiStore);
     const { directAccessPaste } = useSearchStore();
+    const { sentryErrorReporting } = storeToRefs(useAdvancedSettingsStore());
+    const { setSentryErrorReporting } = useAdvancedSettingsStore();
 
     onMounted(() => {
+        if (!sentryErrorReporting.value) return;
         const feedback = Sentry.getFeedback();
         feedback?.attachTo(document.getElementById('feedback'));
     });
diff --git a/src/stores/settings/advanced.js b/src/stores/settings/advanced.js
index 0f97d5d4..5a557eaa 100644
--- a/src/stores/settings/advanced.js
+++ b/src/stores/settings/advanced.js
@@ -467,12 +467,6 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
             return;
         }
 
-        sentryErrorReporting.value = !sentryErrorReporting.value;
-        await configRepository.setString(
-            'VRCX_SentryEnabled',
-            sentryErrorReporting.value ? 'true' : 'false'
-        );
-
         ElMessageBox.confirm(
             'Error reporting setting has been disabled. Would you like to restart VRCX now for the change to take effect?',
             'Restart Required',
@@ -483,7 +477,12 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
                 center: true
             }
         )
-            .then(() => {
+            .then(async () => {
+                sentryErrorReporting.value = !sentryErrorReporting.value;
+                await configRepository.setString(
+                    'VRCX_SentryEnabled',
+                    sentryErrorReporting.value ? 'true' : 'false'
+                );
                 VRCXUpdaterStore.restartVRCX(false);
             })
             .catch(() => {});