From 98f009cbd9c6ebf1bf373b53f4e8d23a5c5757e7 Mon Sep 17 00:00:00 2001 From: Natsumi Date: Fri, 28 Jun 2024 04:15:01 +1200 Subject: [PATCH] Fixes --- Dotnet/Overlay/VRCXVR.cs | 4 ++-- html/src/index.pug | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dotnet/Overlay/VRCXVR.cs b/Dotnet/Overlay/VRCXVR.cs index 0cf538d5..6c4521e5 100644 --- a/Dotnet/Overlay/VRCXVR.cs +++ b/Dotnet/Overlay/VRCXVR.cs @@ -71,8 +71,8 @@ namespace VRCX { var thread = _thread; _thread = null; - thread.Interrupt(); - thread.Join(); + thread?.Interrupt(); + thread?.Join(); } public void Restart() diff --git a/html/src/index.pug b/html/src/index.pug index 4a599af4..5b91d1a7 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -2327,7 +2327,7 @@ html //- dialog Table: Send Invite Response Message el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="sendInviteResponseDialog" :visible.sync="sendInviteResponseDialogVisible" :title="$t('dialog.invite_response_message.header')" width="800px") template(v-if="API.currentUser.$isVRCPlus") - input.inviteImageUploadButton(type="file" accept="image/png" @change="inviteImageUpload") + input.inviteImageUploadButton(type="file" accept="image/png,image/jpg,image/jpeg,image/webp,image/bmp,image/gif" @change="inviteImageUpload") data-tables(v-if="sendInviteResponseDialogVisible" v-bind="inviteResponseMessageTable" @row-click="showSendInviteResponseConfirmDialog" style="margin-top:10px;cursor:pointer") el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70") el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message") @@ -2344,7 +2344,7 @@ html //- dialog Table: Send Invite Request Response Message el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="sendInviteRequestResponseDialog" :visible.sync="sendInviteRequestResponseDialogVisible" :title="$t('dialog.invite_request_response_message.header')" width="800px") template(v-if="API.currentUser.$isVRCPlus") - input.inviteImageUploadButton(type="file" accept="image/png" @change="inviteImageUpload") + input.inviteImageUploadButton(type="file" accept="image/png,image/jpg,image/jpeg,image/webp,image/bmp,image/gif" @change="inviteImageUpload") data-tables(v-if="sendInviteRequestResponseDialogVisible" v-bind="inviteRequestResponseMessageTable" @row-click="showSendInviteResponseConfirmDialog" style="margin-top:10px;cursor:pointer") el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70") el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message") @@ -2377,7 +2377,7 @@ html //- el-button(size="mini" @click="clearImageGallerySelect" style="vertical-align:top") {{ $t('dialog.invite_message.clear_selected_image') }} //- template(v-else) //- el-button(size="mini" @click="showGallerySelectDialog" style="margin-right:5px") {{ $t('dialog.invite_message.select_image') }} - input.inviteImageUploadButton(type="file" accept="image/png" @change="inviteImageUpload") + input.inviteImageUploadButton(type="file" accept="image/png,image/jpg,image/jpeg,image/webp,image/bmp,image/gif" @change="inviteImageUpload") data-tables(v-if="sendInviteDialogVisible" v-bind="inviteMessageTable" @row-click="showSendInviteConfirmDialog" style="margin-top:10px;cursor:pointer") el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70") el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message") @@ -2394,7 +2394,7 @@ html //- dialog Table: Send Invite Request Message el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="sendInviteRequestDialog" :visible.sync="sendInviteRequestDialogVisible" :title="$t('dialog.invite_request_message.header')" width="800px") template(v-if="API.currentUser.$isVRCPlus") - input.inviteImageUploadButton(type="file" accept="image/png" @change="inviteImageUpload") + input.inviteImageUploadButton(type="file" accept="image/png,image/jpg,image/jpeg,image/webp,image/bmp,image/gif" @change="inviteImageUpload") data-tables(v-if="sendInviteRequestDialogVisible" v-bind="inviteRequestMessageTable" @row-click="showSendInviteConfirmDialog" style="margin-top:10px;cursor:pointer") el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70") el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message")