mirror of
https://github.com/vector-im/element-web.git
synced 2025-10-18 19:01:55 +02:00
Don't start the client twice
if we have a guest_access_token
This commit is contained in:
parent
1f17b78371
commit
cf7e7d65c8
@ -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,7 +187,9 @@ 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;
|
||||||
Lifecycle.startMatrixClient();
|
if (!clientStarted) {
|
||||||
|
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user