From 4c0b2c3299f663ce6297115de88971371ebe942d Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Mon, 15 Sep 2025 14:28:04 +1200
Subject: [PATCH] Small fixes, fix open instance game crash

---
 .vscode/extensions.json                       |  3 +-
 .../scss/themes/_theme.dark_styles.scss       |  2 +-
 src/components/InviteYourself.vue             | 12 +++++-
 src/components/dialogs/NewInstanceDialog.vue  |  3 +-
 src/stores/launch.js                          | 43 ++++++++++++++-----
 5 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 5a3ea923..6a7a666e 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,7 +4,6 @@
         "lokalise.i18n-ally",
         "dbaeumer.vscode-eslint",
         "esbenp.prettier-vscode",
-        "lllllllqw.jsdoc",
-        "mgmcdermott.vscode-language-babel"
+        "lllllllqw.jsdoc"
     ]
 }
diff --git a/src/assets/scss/themes/_theme.dark_styles.scss b/src/assets/scss/themes/_theme.dark_styles.scss
index a24c935c..569b9fba 100644
--- a/src/assets/scss/themes/_theme.dark_styles.scss
+++ b/src/assets/scss/themes/_theme.dark_styles.scss
@@ -356,7 +356,7 @@ div.x-friend-list
 .el-tag.el-tag--info {
     background-color: $--theme-bg-5;
     border-color: $--theme-border-2;
-    color: $--theme-info;
+    color: $--theme-text-2;
 }
 
 .el-tag.el-tag--warning {
diff --git a/src/components/InviteYourself.vue b/src/components/InviteYourself.vue
index 5e2a48cd..df074397 100644
--- a/src/components/InviteYourself.vue
+++ b/src/components/InviteYourself.vue
@@ -7,16 +7,22 @@
             <el-button v-show="isVisible" @click="confirmInvite" size="small" :icon="Message" circle />
         </el-tooltip>
         <el-tooltip v-else placement="top" :content="t('dialog.user.info.open_in_vrchat_tooltip')">
-            <el-button @click="openInstance" size="small" :icon="Message" circle />
+            <el-button v-if="isOpeningInstance" size="small" circle>
+                <el-icon class="is-loading">
+                    <Loading />
+                </el-icon>
+            </el-button>
+            <el-button v-else @click="openInstance" size="small" :icon="Message" circle />
         </el-tooltip>
     </div>
 </template>
 
 <script setup>
     import { ElMessage } from 'element-plus';
-    import { Message } from '@element-plus/icons-vue';
+    import { Loading, Message } from '@element-plus/icons-vue';
     import { computed } from 'vue';
     import { useI18n } from 'vue-i18n';
+    import { storeToRefs } from 'pinia';
     import { instanceRequest } from '../api';
     import { checkCanInviteSelf, parseLocation } from '../shared/utils';
     import { useInviteStore, useLaunchStore } from '../stores';
@@ -31,6 +37,8 @@
     const { canOpenInstanceInGame } = useInviteStore();
     const { tryOpenInstanceInVrc } = useLaunchStore();
 
+    const { isOpeningInstance } = storeToRefs(useLaunchStore());
+
     const isVisible = computed(() => checkCanInviteSelf(props.location));
 
     function confirmInvite() {
diff --git a/src/components/dialogs/NewInstanceDialog.vue b/src/components/dialogs/NewInstanceDialog.vue
index 1f9e8d84..20017f64 100644
--- a/src/components/dialogs/NewInstanceDialog.vue
+++ b/src/components/dialogs/NewInstanceDialog.vue
@@ -531,10 +531,9 @@
     const { currentUserGroups } = storeToRefs(useGroupStore());
     const { cachedGroups, handleGroupPermissions } = useGroupStore();
     const { lastLocation } = storeToRefs(useLocationStore());
-    const { showLaunchDialog } = useLaunchStore();
+    const { showLaunchDialog, tryOpenInstanceInVrc } = useLaunchStore();
     const { createNewInstance } = useInstanceStore();
     const { currentUser } = storeToRefs(useUserStore());
-    const { tryOpenInstanceInVrc } = useLaunchStore();
     const { canOpenInstanceInGame } = useInviteStore();
 
     const newInstanceDialogIndex = ref(2000);
diff --git a/src/stores/launch.js b/src/stores/launch.js
index 6590d559..3f3955ee 100644
--- a/src/stores/launch.js
+++ b/src/stores/launch.js
@@ -9,6 +9,7 @@ import { parseLocation } from '../shared/utils';
 export const useLaunchStore = defineStore('Launch', () => {
     const state = reactive({
         isLaunchOptionsDialogVisible: false,
+        isOpeningInstance: false,
         launchDialogData: {
             visible: false,
             loading: false,
@@ -24,6 +25,13 @@ export const useLaunchStore = defineStore('Launch', () => {
         }
     });
 
+    const isOpeningInstance = computed({
+        get: () => state.isOpeningInstance,
+        set: (value) => {
+            state.isOpeningInstance = value;
+        }
+    });
+
     const launchDialogData = computed({
         get: () => state.launchDialogData,
         set: (value) => {
@@ -102,9 +110,14 @@ export const useLaunchStore = defineStore('Launch', () => {
      * @returns {Promise<void>}
      */
     async function tryOpenInstanceInVrc(location, shortName) {
-        const launchUrl = await getLaunchUrl(location, shortName);
+        if (state.isOpeningInstance) {
+            return;
+        }
+        state.isOpeningInstance = true;
+        let launchUrl = '';
         let result = false;
         try {
+            launchUrl = await getLaunchUrl(location, shortName);
             result = await AppApi.TryOpenInstanceInVrc(launchUrl);
         } catch (e) {
             console.error(e);
@@ -117,17 +130,24 @@ export const useLaunchStore = defineStore('Launch', () => {
                 type: 'warning'
             });
             // self invite fallback
-            const L = parseLocation(location);
-            await instanceRequest.selfInvite({
-                instanceId: L.instanceId,
-                worldId: L.worldId,
-                shortName
-            });
-            ElMessage({
-                message: 'Self invite sent',
-                type: 'success'
-            });
+            try {
+                const L = parseLocation(location);
+                await instanceRequest.selfInvite({
+                    instanceId: L.instanceId,
+                    worldId: L.worldId,
+                    shortName
+                });
+                ElMessage({
+                    message: 'Self invite sent',
+                    type: 'success'
+                });
+            } catch (e) {
+                console.error(e);
+            }
         }
+        setTimeout(() => {
+            state.isOpeningInstance = false;
+        }, 1000);
     }
 
     /**
@@ -192,6 +212,7 @@ export const useLaunchStore = defineStore('Launch', () => {
         state,
 
         isLaunchOptionsDialogVisible,
+        isOpeningInstance,
         launchDialogData,
         showLaunchOptions,
         showLaunchDialog,