Merge pull request #3350 from matrix-org/dbkr/dont_infinite_loop_on_s…

…erver_change Don't infinite loop on server change
matrix-org · Aug 28, 2019 · 86fcaa2 · 86fcaa2
2 parents 8e799b7 + ac2b8b8
commit 86fcaa2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
@@ -82,7 +82,12 @@ export default class ServerConfig extends React.PureComponent {
         // Always try and use the defaults first
         const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
         if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
-            this.setState({busy: false, errorText: ""});
+            this.setState({
+                hsUrl: defaultConfig.hsUrl,
+                isUrl: defaultConfig.isUrl,
+                busy: false,
+                errorText: "",
+            });
             this.props.onServerConfigChange(defaultConfig);
             return defaultConfig;
         }