Merge pull request #751 from matrix-org/luke/fix-start-login

Add null check to start_login
2017-03-14 15:19:30 +00:00 · 2017-03-14 15:19:30 +00:00 · 1cb653ac16
parent 5e93dde0dd 47958180a6
commit 1cb653ac16
1 changed files with 3 additions and 1 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -351,7 +351,9 @@ module.exports = React.createClass({
                this.notifyNewScreen('register');
                break;
            case 'start_login':
-                if (MatrixClientPeg.get().isGuest()) {
+                if (MatrixClientPeg.get() &&
+                    MatrixClientPeg.get().isGuest()
+                ) {
                    this.setState({
                        guestCreds: MatrixClientPeg.getCredentials(),
                    });