From a6f5fbc2768461a12cec12bf5e5eaac2e3ab3354 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Tue, 20 Jul 2021 05:29:54 +1200
Subject: [PATCH] Small changes

---
 html/src/app.js    |  6 ++----
 html/src/index.pug | 14 ++++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/html/src/app.js b/html/src/app.js
index 4b77494d..64413623 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -4428,18 +4428,16 @@ speechSynthesis.getVoices();
     $app.methods.playNoty = function (notyFeed) {
         var playNotificationTTS = false;
         if ((this.notificationTTS === 'Always') ||
-            ((this.notificationTTS === 'Outside VR') && ((this.isGameNoVR) || (!this.isGameRunning))) ||
             ((this.notificationTTS === 'Inside VR') && (!this.isGameNoVR) && (this.isGameRunning)) ||
             ((this.notificationTTS === 'Game Closed') && (!this.isGameRunning)) ||
-            ((this.notificationTTS === 'Desktop Mode') && (this.isGameNoVR) && (this.isGameRunning))) {
+            ((this.notificationTTS === 'Game Running') && (this.isGameRunning))) {
             playNotificationTTS = true;
         }
         var playDesktopToast = false;
         if ((this.desktopToast === 'Always') ||
-            ((this.desktopToast === 'Outside VR') && ((this.isGameNoVR) || (!this.isGameRunning))) ||
             ((this.desktopToast === 'Inside VR') && (!this.isGameNoVR) && (this.isGameRunning)) ||
             ((this.desktopToast === 'Game Closed') && (!this.isGameRunning)) ||
-            ((this.desktopToast === 'Desktop Mode') && (this.isGameNoVR) && (this.isGameRunning))) {
+            ((this.desktopToast === 'Game Running') && (this.isGameRunning))) {
             playDesktopToast = true;
         }
         var playXSNotification = false;
diff --git a/html/src/index.pug b/html/src/index.pug
index 39fae468..9f3d169c 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -678,9 +678,6 @@ html
                     div.options-container-item
                         span.name Disable Tooltips
                         el-switch(v-model="hideTooltips")
-                    div.options-container-item
-                        span.name Use a Primary Password
-                        el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]")
                 div.options-container
                     span.header Side Panel
                     br
@@ -803,10 +800,9 @@ html
                         br
                         el-radio-group(v-model="desktopToast" size="mini")
                             el-radio-button(label="Never")
-                            el-radio-button(label="Desktop Mode")
-                            el-radio-button(label="Outside VR")
                             el-radio-button(label="Inside VR")
                             el-radio-button(label="Game Closed")
+                            el-radio-button(label="Game Running")
                             el-radio-button(label="Always")
                     div.options-container-item
                         el-button(size="small" icon="el-icon-chat-square" @click="showNotyFeedFiltersDialog()") Notification Filters
@@ -817,10 +813,9 @@ html
                         br
                         el-radio-group(v-model="notificationTTS" size="mini")
                             el-radio-button(label="Never")
-                            el-radio-button(label="Desktop Mode")
-                            el-radio-button(label="Outside VR")
                             el-radio-button(label="Inside VR")
                             el-radio-button(label="Game Closed")
+                            el-radio-button(label="Game Running")
                             el-radio-button(label="Always")
                     div.options-container-item
                         span.name TTS Voice
@@ -864,6 +859,9 @@ html
                         el-switch(v-model="autoSweepVRChatCache")
                 div.options-container
                     span.header Application
+                    div.options-container-item
+                        span.name Use a Primary Password
+                        el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]")
                     div.options-container-item
                         span.name Start at Windows startup
                         el-switch(v-model="isStartAtWindowsStartup")
@@ -1617,7 +1615,7 @@ html
             el-dialog.x-dialog(ref="launchOptionsDialog" :visible.sync="launchOptionsDialog.visible" title="Launch Options" width="400px")
                 div(style='font-size:12px;')
                     | These options are for advanced users only. #[br]
-                    | to change fps: --fps=&lt;N&gt; ex) #[el-tag(size="mini") --fps=144]
+                    | to change fps: --fps=&lt;N&gt; e.g.) #[el-tag(size="mini") --fps=144]
                 el-input(type="textarea" v-model="launchOptionsDialog.arguments" size="mini" show-word-limit :autosize="{ minRows:2, maxRows:5 }" placeholder="" style="margin-top:10px")
                 template(#footer)
                     div(style="display:flex")