From 2b9c102f079e83933d1291695632238858bc5401 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 9 Oct 2019 22:27:49 +0100
Subject: [PATCH] SettingsFlag always run ToggleSwitch fully-controlled

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/SettingsFlag.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
index e4df15a096..f557690514 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.js
@@ -62,13 +62,6 @@ module.exports = createReactClass({
     },
 
     render: function() {
-        const value = this.props.manualSave ? this.state.value : SettingsStore.getValueAt(
-            this.props.level,
-            this.props.name,
-            this.props.roomId,
-            this.props.isExplicit,
-        );
-
         const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
 
         let label = this.props.label;
@@ -78,7 +71,7 @@ module.exports = createReactClass({
         return (
             <div className="mx_SettingsFlag">
                 <span className="mx_SettingsFlag_label">{label}</span>
-                <ToggleSwitch checked={value} onChange={this.onChange} disabled={!canChange} aria-label={label} />
+                <ToggleSwitch checked={this.state.value} onChange={this.onChange} disabled={!canChange} aria-label={label} />
             </div>
         );
     },