From 1dbdbc163b93e422a71bd3570c27c958f56895ff Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 7 Jun 2017 11:55:24 +0100
Subject: [PATCH] Cancel 'join room' action if 'log in' is clicked

or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes https://github.com/vector-im/riot-web/issues/4217
---
 src/components/structures/RoomView.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index d3e0f6ee2d..d58b017f4d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -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',
                         });