From 6e28a0caaca1cbd9b852b16e98da5ece67e5df6b Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <rreverser@google.com>
Date: Mon, 12 Jul 2021 13:09:42 +0000
Subject: [PATCH] Fix config becoming unblocked while still in progress

---
 ui.html | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ui.html b/ui.html
index bca8430..880ef32 100644
--- a/ui.html
+++ b/ui.html
@@ -112,7 +112,7 @@
   }
 
   class Settings extends Component {
-    state = { inProgress: true, config: 'Connecting...' };
+    state = { inProgress: false, config: 'Connecting...' };
 
     constructor() {
       super();
@@ -124,10 +124,6 @@
       })();
     }
 
-    setStatePromise(state) {
-      return new Promise(resolve => this.setState(state, resolve));
-    }
-
     handleInput = async e => {
       let name = e.target.id;
       if (!name.startsWith('config-')) {
@@ -147,7 +143,7 @@
           break;
       }
 
-      await this.setStatePromise({ inProgress: true });
+      this.setState({ inProgress: true });
 
       try {
         await scheduleOp(() => context.setConfigValue(name, value));
@@ -156,6 +152,7 @@
       }
 
       await this.refreshConfig();
+      this.setState({ inProgress: false });
     };
 
     async refreshConfig() {
@@ -165,8 +162,7 @@
       } catch (e) {
         config = String(e);
       }
-      await this.setStatePromise({
-        inProgress: false,
+      this.setState({
         config
       });
     }