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

Don't start the client twice 

if we have a guest_access_token
pull/21833/head
David Baker 2016-08-03 10:15:50 +01:00
parent 1f17b78371
commit cf7e7d65c8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/MatrixChat.js
View File

@ -153,6 +153,8 @@ module.exports = React.createClass({
}, },
componentDidMount: function() { componentDidMount: function() {
let clientStarted = false;
this._autoRegisterAsGuest = false; this._autoRegisterAsGuest = false;
if (this.props.enableGuest) { if (this.props.enableGuest) {
if (!this.getCurrentHsUrl()) { if (!this.getCurrentHsUrl()) {
@ -173,6 +175,7 @@ module.exports = React.createClass({
identityServerUrl: this.getDefaultIsUrl(), identityServerUrl: this.getDefaultIsUrl(),
guest: true guest: true
}); });
clientStarted = true;
} }
else { else {
this._autoRegisterAsGuest = true; this._autoRegisterAsGuest = true;
@ -184,8 +187,10 @@ module.exports = React.createClass({
// Don't auto-register as a guest. This applies if you refresh the page on a // Don't auto-register as a guest. This applies if you refresh the page on a
// logged in client THEN hit the Sign Out button. // logged in client THEN hit the Sign Out button.
this._autoRegisterAsGuest = false; this._autoRegisterAsGuest = false;
if (!clientStarted) {
Lifecycle.startMatrixClient(); Lifecycle.startMatrixClient();
} }
}
this.focusComposer = false; this.focusComposer = false;
// scrollStateMap is a map from room id to the scroll state returned by // scrollStateMap is a map from room id to the scroll state returned by
// RoomView.getScrollState() // RoomView.getScrollState()