From 49742f146cf9340f978a91f88221452ee4385a5a Mon Sep 17 00:00:00 2001 From: Natsumi Date: Tue, 22 Oct 2024 11:46:38 +1300 Subject: [PATCH] Fix desktop notification when set to inside/outside VR --- html/src/app.js | 7 ++----- html/src/vr.js | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/html/src/app.js b/html/src/app.js index e8d8dc19..9dfa1af7 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -6710,11 +6710,8 @@ speechSynthesis.getVoices(); var playDesktopToast = false; if ( this.desktopToast === 'Always' || - (this.desktopToast === 'Outside VR' && - (this.isGameNoVR || !this.isGameRunning)) || - (this.desktopToast === 'Inside VR' && - !this.isGameNoVR && - this.isGameRunning) || + (this.desktopToast === 'Outside VR' && !this.isSteamVRRunning) || + (this.desktopToast === 'Inside VR' && this.isSteamVRRunning) || (this.desktopToast === 'Game Closed' && !this.isGameRunning) || (this.desktopToast === 'Game Running' && this.isGameRunning) || (this.desktopToast === 'Desktop Mode' && diff --git a/html/src/vr.js b/html/src/vr.js index 926332e4..ced53a7a 100644 --- a/html/src/vr.js +++ b/html/src/vr.js @@ -232,7 +232,7 @@ Vue.component('marquee-text', MarqueeText); watch: {}, el: '#x-app', mounted() { - workerTimers.setTimeout(() => AppApiVr.VrInit(), 1000); + workerTimers.setTimeout(() => AppApiVr.VrInit(), 5000); if (this.appType === '1') { this.refreshCustomScript(); this.updateStatsLoop(); @@ -442,6 +442,7 @@ Vue.component('marquee-text', MarqueeText); year: 'numeric', hour: 'numeric', minute: 'numeric', + second: 'numeric', hourCycle: this.config.dtHour12 ? 'h12' : 'h23' }) .replace(' AM', ' am')