diff --git a/Dotnet/Program.cs b/Dotnet/Program.cs index daa9a6b4..f5987362 100644 --- a/Dotnet/Program.cs +++ b/Dotnet/Program.cs @@ -123,6 +123,7 @@ namespace VRCX { Version = $"{buildName} Build"; } + Version = Version.Replace("\r", "").Replace("\n", ""); } private static void Run() diff --git a/html/src/app.js b/html/src/app.js index 64abe025..bc9ef285 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -2622,9 +2622,9 @@ speechSynthesis.getVoices(); return args; }) .catch((err) => { - if (err && err.includes('Instance is closed.')) { + if (err?.error?.message) { $app.$message({ - message: 'Instance is closed.', + message: err.error.message, type: 'error' }); throw err; @@ -9970,6 +9970,9 @@ speechSynthesis.getVoices(); // eslint-disable-next-line require-atomic-updates $app.feedSessionTable = await database.getFeedDatabase(); $app.feedTableLookup(); + // eslint-disable-next-line require-atomic-updates + $app.notificationTable.data = await database.getNotifications(); + await this.refreshNotifications(); if (typeof args.json.presence?.groups !== 'undefined') { await $app.loadCurrentUserGroups( args.json.id, @@ -9993,9 +9996,6 @@ speechSynthesis.getVoices(); this.logout(); throw err; } - // eslint-disable-next-line require-atomic-updates - $app.notificationTable.data = await database.getNotifications(); - await this.refreshNotifications(); $app.getAvatarHistory(); $app.getAllMemos(); if ($app.randomUserColours) { @@ -19715,10 +19715,9 @@ speechSynthesis.getVoices(); ) { this.$message({ message: - "You can't invite yourself in 'Do Not Disturb' mode", + "You may not receive this invite in 'Do Not Disturb' mode", type: 'error' }); - return; } D.loading = true; var inviteLoop = () => { @@ -29887,10 +29886,12 @@ speechSynthesis.getVoices(); if (this.groupDialog.visible && this.groupDialog.id === groupId) { this.showGroupDialog(groupId); } - API.currentUserGroups.delete(groupId); - API.getCachedGroup({ groupId }).then((args) => { - this.groupChange(args.ref, 'Left group'); - }); + if (API.currentUserGroups.has(groupId)) { + API.currentUserGroups.delete(groupId); + API.getCachedGroup({ groupId }).then((args) => { + this.groupChange(args.ref, 'Left group'); + }); + } }; // group search diff --git a/html/src/theme.material3.scss b/html/src/theme.material3.scss index 05b7400e..e39e1ac0 100644 --- a/html/src/theme.material3.scss +++ b/html/src/theme.material3.scss @@ -1318,7 +1318,6 @@ img.x-link.el-popover__reference { font-size: var(--md-sys-typescale-label-medium-size); font-weight: var(--md-sys-typescale-label-medium-weight); letter-spacing: var(--md-sys-typescale-label-medium-tracking); - pointer-events: none; } /* Dialog / Message box */