diff --git a/LogWatcher.cs b/LogWatcher.cs index aaa679a2..75aa33a0 100644 --- a/LogWatcher.cs +++ b/LogWatcher.cs @@ -338,7 +338,7 @@ namespace VRCX return true; } - if (line.Contains("] Joining ")) + if (line.Contains("] Joining ") && !line.Contains("or Creating Room: ")) { var lineOffset = line.LastIndexOf("] Joining "); if (lineOffset < 0) diff --git a/html/src/app.js b/html/src/app.js index 08ca7e54..bbac1566 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -8210,10 +8210,9 @@ speechSynthesis.getVoices(); } } }); - if (this.photonLobbyTimeout.length > 0 || hudTimeout.length > 0) { - hudTimeout.sort(function (a, b) { - if (a.time > b.time) { - return 1; + hudTimeout.sort(function (a, b) { + if (a.time > b.time) { + return 1; } if (a.time < b.time) { return -1; @@ -8244,12 +8243,14 @@ speechSynthesis.getVoices(); } AppApi.ExecuteVrOverlayFunction( 'updateHudTimeout', - JSON.stringify(filteredHudTimeout) - ); - } + JSON.stringify(filteredHudTimeout) + ); + } + if (this.photonLobbyTimeout.length > 0 || hudTimeout.length > 0) { this.photonLobbyTimeout = hudTimeout; - this.getCurrentInstanceUserList(); + } else { + this.photonLobbyTimeout = hudTimeout; } this.photonBotCheck(event7List); }); diff --git a/html/src/app.scss b/html/src/app.scss index df40883b..c7b449db 100644 --- a/html/src/app.scss +++ b/html/src/app.scss @@ -97,7 +97,6 @@ } .el-table__row:hover .el-table__cell .cell { - -webkit-box-orient: unset; -webkit-line-clamp: unset; }