Merge pull request #1646 from matrix-org/dbkr/nullchecks4u

Add some null checks
matrix-org · Dec 5, 2017 · 130c056 · 130c056
2 parents 4f58b92 + 87c808a
commit 130c056
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
@@ -389,6 +389,8 @@ function _persistCredentialsToLocalStorage(credentials) {
  * Logs the current session out and transitions to the logged-out state
  */
 export function logout() {
+    if (!MatrixClientPeg.get()) return;
+
     if (MatrixClientPeg.get().isGuest()) {
         // logout doesn't work for guest sessions
         // Also we sometimes want to re-log in a guest session

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
@@ -53,8 +53,10 @@ export default class UserProvider extends AutocompleteProvider {
     }
 
     destroy() {
-        MatrixClientPeg.get().removeListener("Room.timeline", this._onRoomTimelineBound);
-        MatrixClientPeg.get().removeListener("RoomState.members", this._onRoomStateMemberBound);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("Room.timeline", this._onRoomTimelineBound);
+            MatrixClientPeg.get().removeListener("RoomState.members", this._onRoomStateMemberBound);
+        }
     }
 
     _onRoomTimeline(ev, room, toStartOfTimeline, removed, data) {