diff --git a/src/stores/updateLoop.js b/src/stores/updateLoop.js index 856da840..1e7da309 100644 --- a/src/stores/updateLoop.js +++ b/src/stores/updateLoop.js @@ -15,6 +15,7 @@ import { useUserStore } from './user'; import { useVrcxStore } from './vrcx'; import { useVRCXUpdaterStore } from './vrcxUpdater'; import { useGroupStore } from './group'; +import { useVrStore } from './vr'; export const useUpdateLoopStore = defineStore('UpdateLoop', () => { const state = reactive({ @@ -67,6 +68,7 @@ export const useUpdateLoopStore = defineStore('UpdateLoop', () => { const vrcxUpdaterStore = useVRCXUpdaterStore(); const uiStore = useUiStore(); const groupStore = useGroupStore(); + const vrStore = useVrStore(); try { if (watchState.isLoggedIn) { if (--state.nextCurrentUserRefresh <= 0) { @@ -143,6 +145,7 @@ export const useUpdateLoopStore = defineStore('UpdateLoop', () => { await AppApi.IsSteamVRRunning(), false ); + vrStore.vrInit(); // TODO: make this event based } } if (--state.nextDatabaseOptimize <= 0) { diff --git a/src/stores/vr.js b/src/stores/vr.js index 778a683e..f2fec677 100644 --- a/src/stores/vr.js +++ b/src/stores/vr.js @@ -27,9 +27,7 @@ export const useVrStore = defineStore('Vr', () => { const userStore = useUserStore(); const sharedFeedStore = useSharedFeedStore(); - const state = reactive({ - overlayActive: false - }); + const state = reactive({}); watch( () => watchState.isFriendsLoaded, @@ -50,8 +48,6 @@ export const useVrStore = defineStore('Vr', () => { sharedFeedStore.updateSharedFeed(true); friendStore.onlineFriendCount = 0; // force an update friendStore.updateOnlineFriendCoutner(); - - state.overlayActive = true; } async function saveOpenVROption() { @@ -177,16 +173,7 @@ export const useVrStore = defineStore('Vr', () => { newState.overlayHand ); - if (state.overlayActive !== newState.active) { - if ( - window.electron.getWristOverlayWindow() || - window.electron.getHmdOverlayWindow() - ) { - vrInit(); - state.overlayActive = newState.active; - } - setTimeout(() => vrInit(), 1000); // give the overlay time to load - } + vrInit(); // sometimes this runs before the overlay is ready } }