Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login

Cancel 'join room' action if 'log in' is clicked
pull/21833/head
David Baker 2017-06-07 11:59:45 +01:00 committed by GitHub
commit ccaa55d2c8
1 changed files with 3 additions and 0 deletions

View File

@ -791,6 +791,9 @@ module.exports = React.createClass({
if (submitted) {
this.props.onRegistered(credentials);
} else {
dis.dispatch({
action: 'cancel_after_sync_prepared',
});
dis.dispatch({
action: 'cancel_join',
});