Merge branch 'develop' into travis/moar-jitsi

This commit is contained in:
Travis Ralston 2020-04-20 09:21:48 -06:00
commit d8a5ba9b14
86 changed files with 1067 additions and 495 deletions

View file

@ -159,7 +159,7 @@ class RoomViewStore extends Store {
}
case 'sync_state':
this._setState({
matrixClientIsReady: MatrixClientPeg.get().isInitialSyncComplete(),
matrixClientIsReady: MatrixClientPeg.get() && MatrixClientPeg.get().isInitialSyncComplete(),
});
break;
}