Fix current user instance timer when game is running elsewhere

Natsumi-sama · Sep 7, 2023 · 5330b30 · 5330b30
1 parent c6ccb14
commit 5330b30
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/html/src/app.js b/html/src/app.js
@@ -4836,8 +4836,7 @@ speechSynthesis.getVoices();
 
                 this.currentUser.presence.instance = content.instance;
                 this.currentUser.presence.world = content.worldId;
-                this.currentUser.$locationTag = content.location;
-                $app.updateCurrentUserLocation();
+                $app.setCurrentUserLocation(content.location);
                 break;
 
             case 'group-joined':
@@ -5106,7 +5105,8 @@ speechSynthesis.getVoices();
         methods: {
             update() {
                 if (!this.epoch) {
-                    this.text = '';
+                    this.text = '-';
+                    return;
                 }
                 this.text = timeToText(Date.now() - this.epoch);
             }
@@ -5165,7 +5165,7 @@ speechSynthesis.getVoices();
                 if (epoch >= 0) {
                     this.text = timeToText(epoch);
                 } else {
-                    this.text = '';
+                    this.text = '-';
                 }
             }
         },
@@ -23092,14 +23092,15 @@ speechSynthesis.getVoices();
             if (result || !this.isRealInstance(location)) {
                 return;
             }
+            // wait a bit for SteamVR to potentially close before deciding to relaunch
+            var restartDelay = 4000;
             if (this.isGameNoVR) {
-                this.restartCrashedGame(location);
-                return;
+                // wait for game to close before relaunching
+                restartDelay = 2000;
             }
-            // wait a bit for SteamVR to potentially close before deciding to relaunch
             workerTimers.setTimeout(
                 () => this.restartCrashedGame(location),
-                3000
+                restartDelay
             );
         });
     };
@@ -25047,17 +25048,25 @@ speechSynthesis.getVoices();
         ref.$online_for = API.currentUser.$online_for;
         ref.$offline_for = API.currentUser.$offline_for;
         ref.$location = API.parseLocation(currentLocation);
-        ref.$location_at = this.lastLocation.date;
-        ref.$travelingToTime = this.lastLocationDestinationTime;
-        if (!this.isGameRunning) {
-            ref.$location_at = Date.now();
-            ref.$travelingToTime = Date.now();
+        if (!this.isGameRunning || this.gameLogDisabled) {
+            ref.$location_at = API.currentUser.$location_at;
+            ref.$travelingToTime = API.currentUser.$travelingToTime;
             this.applyUserDialogLocation();
             this.applyWorldDialogInstances();
             this.applyGroupDialogInstances();
+        } else {
+            ref.$location_at = this.lastLocation.date;
+            ref.$travelingToTime = this.lastLocationDestinationTime;
         }
     };
 
+    $app.methods.setCurrentUserLocation = function (location) {
+        API.currentUser.$location_at = Date.now();
+        API.currentUser.$travelingToTime = Date.now();
+        API.currentUser.$locationTag = location;
+        this.updateCurrentUserLocation();
+    };
+
     $app.data.avatarHistory = new Set();
     $app.data.avatarHistoryArray = [];
 

diff --git a/html/src/index.pug b/html/src/index.pug
@@ -122,7 +122,7 @@ html
                                             img(v-lazy="userImage(API.currentUser)")
                                         .detail
                                             span.name(v-text="API.currentUser.displayName" :style="{'color':API.currentUser.$userColour}")
-                                            location.extra(v-if="isGameRunning" :location="lastLocation.location" :traveling="lastLocationDestination" :link="false")
+                                            location.extra(v-if="isGameRunning && !gameLogDisabled" :location="lastLocation.location" :traveling="lastLocationDestination" :link="false")
                                             location.extra(v-else-if="isRealInstance(API.currentUser.$locationTag) || isRealInstance(API.currentUser.$travelingToLocation)" :location="API.currentUser.$locationTag" :traveling="API.currentUser.$travelingToLocation" :link="false")
                                             span.extra(v-else v-text="API.currentUser.statusDescription")
                                 .x-friend-group.x-link(@click="isFriendsGroup0 = !isFriendsGroup0" v-show="friendsGroup0.length")