Avoid flashing up login screen during guest registration

Fix a bug where we would flash up the login screen during guest registration if
you followed a room link.
pull/21833/head
Richard van der Hoff 2016-08-10 14:34:44 +01:00
parent 6aa5e5a493
commit 68f8db3834
1 changed files with 3 additions and 4 deletions

View File

@ -791,11 +791,10 @@ module.exports = React.createClass({
// we can't view a room unless we're logged in // we can't view a room unless we're logged in
// (a guest account is fine) // (a guest account is fine)
if (!this.state.logged_in) { if (!this.state.logged_in) {
// we may still be loading (ie, trying to register a guest
// session); otherwise we're (probably) already showing a login
// screen. Either way, we'll show the room once the client starts.
this.starting_room_alias_payload = payload; this.starting_room_alias_payload = payload;
// Login is the default screen, so we'd do this anyway,
// but this will set the URL bar appropriately.
dis.dispatch({ action: 'start_login' });
return;
} else { } else {
dis.dispatch(payload); dis.dispatch(payload);
} }