From bce72d8b6efb5e4524ae3cc269d02b2dbf0c3e51 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Tue, 4 Nov 2025 02:35:56 +1100
Subject: [PATCH] Small fixes

---
 src/stores/user.js                                    | 2 +-
 src/stores/vrcxUpdater.js                             | 6 ++++--
 src/views/Favorites/components/FavoritesAvatarTab.vue | 2 +-
 src/views/Favorites/components/FavoritesWorldTab.vue  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/stores/user.js b/src/stores/user.js
index 4e9086c4..251d27ee 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -1046,7 +1046,7 @@ export const useUserStore = defineStore('User', () => {
         let friendCount = 0;
         const playersInInstance = locationStore.lastLocation.playerList;
         const cachedCurrentUser = cachedUsers.get(currentUser.value.id);
-        const currentLocation = cachedCurrentUser.$location.tag;
+        const currentLocation = cachedCurrentUser?.$location?.tag;
         if (!L.isOffline && currentLocation === L.tag) {
             ref = cachedUsers.get(currentUser.value.id);
             if (typeof ref !== 'undefined') {
diff --git a/src/stores/vrcxUpdater.js b/src/stores/vrcxUpdater.js
index 1aaf42c6..d2bdb963 100644
--- a/src/stores/vrcxUpdater.js
+++ b/src/stores/vrcxUpdater.js
@@ -190,6 +190,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
         const url = branches[branch.value].urlLatest;
         checkingForVRCXUpdate.value = true;
         let response;
+        let json;
         try {
             response = await webApiService.execute({
                 url,
@@ -198,6 +199,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
                     'VRCX-ID': vrcxId.value
                 }
             });
+            json = JSON.parse(response.data);
         } finally {
             checkingForVRCXUpdate.value = false;
         }
@@ -211,7 +213,6 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
             return;
         }
         pendingVRCXUpdate.value = false;
-        const json = JSON.parse(response.data);
         if (AppDebug.debugWebRequests) {
             console.log(json, response);
         }
@@ -262,6 +263,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
         const url = branches[branch.value].urlReleases;
         checkingForVRCXUpdate.value = true;
         let response;
+        let json;
         try {
             response = await webApiService.execute({
                 url,
@@ -270,6 +272,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
                     'VRCX-ID': vrcxId.value
                 }
             });
+            json = JSON.parse(response.data);
         } finally {
             checkingForVRCXUpdate.value = false;
         }
@@ -282,7 +285,6 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
             });
             return;
         }
-        const json = JSON.parse(response.data);
         if (AppDebug.debugWebRequests) {
             console.log(json, response);
         }
diff --git a/src/views/Favorites/components/FavoritesAvatarTab.vue b/src/views/Favorites/components/FavoritesAvatarTab.vue
index a85352d9..35904753 100644
--- a/src/views/Favorites/components/FavoritesAvatarTab.vue
+++ b/src/views/Favorites/components/FavoritesAvatarTab.vue
@@ -180,7 +180,7 @@
                             @click.stop="promptLocalAvatarFavoriteGroupDelete(group)"></el-button>
                     </el-tooltip>
                 </template>
-                <div v-if="localAvatarFavorites[group].length" class="x-friend-list" :style="{ marginTop: '10px' }">
+                <div v-if="localAvatarFavorites[group]?.length" class="x-friend-list" :style="{ marginTop: '10px' }">
                     <FavoritesAvatarItem
                         v-for="favorite in localAvatarFavorites[group]"
                         :key="favorite.id"
diff --git a/src/views/Favorites/components/FavoritesWorldTab.vue b/src/views/Favorites/components/FavoritesWorldTab.vue
index 088d9563..2674d4ab 100644
--- a/src/views/Favorites/components/FavoritesWorldTab.vue
+++ b/src/views/Favorites/components/FavoritesWorldTab.vue
@@ -176,7 +176,7 @@
                             @click.stop="promptLocalWorldFavoriteGroupDelete(group)" />
                     </el-tooltip>
                 </template>
-                <div v-if="localWorldFavorites[group].length" class="x-friend-list" style="margin-top: 10px">
+                <div v-if="localWorldFavorites[group]?.length" class="x-friend-list" style="margin-top: 10px">
                     <el-scrollbar height="700px" @end-reached="localWorldFavoritesLoadMore">
                         <FavoritesWorldLocalItem
                             v-for="favorite in sliceLocalWorldFavorites(group)"