From 7e9b18458dbf88ec8fbec84b8a5009b5f9f6a33f Mon Sep 17 00:00:00 2001
From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
Date: Thu, 16 Mar 2023 11:27:48 -0400
Subject: [PATCH] ui: fix apply settings (#1045)

---
 src_assets/common/assets/web/config.html | 36 +++++++++++++++---------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 3e56413a..af7ac58d 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -475,7 +475,7 @@
         </div>
       </div>
       <!--Output Name -->
-      <div class="mb-3" class="config-page" v-if="platform === 'windows'">
+      <div class="mb-3 config-page" v-if="platform === 'windows'">
         <label for="output_name" class="form-label">Output Name</label>
         <input
           type="text"
@@ -502,7 +502,7 @@
           Disable if you encounter any VSync-related issues.
         </div>
       </div>
-      <div class="mb-3" class="config-page" v-if="platform === 'linux'">
+      <div class="mb-3 config-page" v-if="platform === 'linux'">
         <label for="output_name" class="form-label">Monitor number</label>
         <input
           type="text"
@@ -1059,7 +1059,8 @@
         this.config.fps = JSON.stringify(this.fps).replace(/"/g, "");
       },
       save() {
-        this.saved = this.restarted = false;
+        this.saved = false;
+        this.restarted = false;
         this.serialize();
 
         // create a temp copy of this.config to use for the post request
@@ -1089,23 +1090,32 @@
           }
         }
 
-        fetch("/api/config", {
+        return fetch("/api/config", {
           method: "POST",
           body: JSON.stringify(config),
         }).then((r) => {
-          if (r.status === 200) this.saved = true;
+          if (r.status === 200) {
+            this.saved = true
+            return this.saved
+          }
+          else {
+            return false
+          }
         });
       },
       apply() {
         this.saved = this.restarted = false;
-        this.save();
-        if (this.saved === true) {
-          fetch("/api/restart", {
-            method: "POST",
-          }).then((r) => {
-            if (r.status === 200) this.restarted = true;
-          });
-        }
+        let saved = this.save();
+
+        saved.then((result) => {
+          if (result === true) {
+            fetch("/api/restart", {
+              method: "POST"
+            }).then((r) => {
+              if (r.status === 200) this.restarted = true;
+            });
+          }
+        });
       },
     },
   });