From e158eec94d78d1c3ab1a63d5e0c91214632a22b1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Oct 2015 13:48:17 +0100
Subject: [PATCH] Unset matrix client first otherwise login sets it, the  it
 gets unset and you can't log in again.

---
 src/controllers/pages/MatrixChat.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/pages/MatrixChat.js b/src/controllers/pages/MatrixChat.js
index 3432a925b6..d1e289c9cc 100644
--- a/src/controllers/pages/MatrixChat.js
+++ b/src/controllers/pages/MatrixChat.js
@@ -85,10 +85,6 @@ module.exports = {
         var self = this;
         switch (payload.action) {
             case 'logout':
-                this.replaceState({
-                    logged_in: false,
-                    ready: false
-                });
                 if (window.localStorage) {
                     window.localStorage.clear();
                 }
@@ -98,6 +94,10 @@ module.exports = {
                 MatrixClientPeg.get().removeAllListeners();
                 MatrixClientPeg.unset();
                 this.notifyNewScreen('login');
+                this.replaceState({
+                    logged_in: false,
+                    ready: false
+                });
                 break;
             case 'start_registration':
                 if (this.state.logged_in) return;