Fix desktop notification when set to inside/outside VR

vrcx-team · Oct 24, 2024 · 49742f1 · 49742f1
1 parent 1eefbb4
commit 49742f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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')