Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined

Prevent error when clicking 'log in'
2016-09-30 11:04:18 +01:00
parent ca5204c3f8 7b28dde263
commit 302074c71f
1 changed files with 3 additions and 1 deletions
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -67,7 +67,9 @@ export default class MessageComposer extends React.Component {
    }

    componentWillUnmount() {
-        MatrixClientPeg.get().removeListener("event", this.onEvent);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("event", this.onEvent);
+        }
    }

    onEvent(event) {