OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3350 from matrix-org/dbkr/dont_infinite_loop_on_server_change 

Don't infinite loop on server change
pull/21833/head
David Baker 2019-08-28 09:18:35 -04:00 committed by GitHub
parent 8e799b7136 ac2b8b874f
commit 86fcaa2af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/auth/ServerConfig.js
View File

@ -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;
}