MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 14:56:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't relaunch game in VR mode after crashing

Browse Source
This commit is contained in:
Natsumi
2023-05-10 17:05:22 +12:00
parent f69faa7ffe
commit b63cbe64e6
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+12 -12
View File
@@ -9803,15 +9803,8 @@ speechSynthesis.getVoices();
return; return;
} }
var dtNow = Date.now(); var dtNow = Date.now();
var bias = this.lastLocationDestinationTime + 5 * 1000; var bias2 = this.photonLastEvent7List + 1.5 * 1000;
var bias1 = this.lastLocation.date + 30 * 1000; if (dtNow > bias2 || this.lastLocation.playerList.size <= 1) {
var bias2 = this.photonLastEvent7List + 2 * 1000;
if (
dtNow < bias ||
dtNow < bias1 ||
dtNow > bias2 ||
this.lastLocation.playerList.size <= 1
) {
if (this.photonLobbyTimeout.length > 0) { if (this.photonLobbyTimeout.length > 0) {
AppApi.ExecuteVrOverlayFunction('updateHudTimeout', '[]'); AppApi.ExecuteVrOverlayFunction('updateHudTimeout', '[]');
} }
@@ -9826,7 +9819,10 @@ speechSynthesis.getVoices();
if (this.photonLobbyJointime.has(id)) { if (this.photonLobbyJointime.has(id)) {
var {joinTime} = this.photonLobbyJointime.get(id); var {joinTime} = this.photonLobbyJointime.get(id);
} }
if (!joinTime || joinTime + 120000 < dtNow) { if (!joinTime) {
console.log(`${id} missing join time`);
}
if (joinTime && joinTime + 120000 < dtNow) {
// wait 2mins for user to load in // wait 2mins for user to load in
hudTimeout.unshift({ hudTimeout.unshift({
userId: this.getUserIdFromPhotonId(id), userId: this.getUserIdFromPhotonId(id),
@@ -10844,8 +10840,8 @@ speechSynthesis.getVoices();
var lastEvent = this.photonEvent7List.get(parseInt(photonId, 10)); var lastEvent = this.photonEvent7List.get(parseInt(photonId, 10));
if (typeof lastEvent !== 'undefined') { if (typeof lastEvent !== 'undefined') {
var timeSinceLastEvent = Date.now() - Date.parse(lastEvent); var timeSinceLastEvent = Date.now() - Date.parse(lastEvent);
if (timeSinceLastEvent > 20 * 1000) { if (timeSinceLastEvent > 10 * 1000) {
// 20 seconds // 10 seconds
text = `has timed out after ${timeToText(timeSinceLastEvent)}`; text = `has timed out after ${timeToText(timeSinceLastEvent)}`;
} }
} }
@@ -21084,6 +21080,10 @@ speechSynthesis.getVoices();
if (result || !this.isRealInstance(lastLocation)) { if (result || !this.isRealInstance(lastLocation)) {
return; return;
} }
if (!desktopMode && !this.isSteamVRRunning) {
console.log("SteamVR isn't running, not relaunching VRChat");
return;
}
AppApi.FocusWindow(); AppApi.FocusWindow();
var message = 'VRChat crashed, attempting to rejoin last instance'; var message = 'VRChat crashed, attempting to rejoin last instance';
this.$message({ this.$message({