Merge branch 'develop' into travis/moar-jitsi

2020-04-20 09:21:48 -06:00
parent 4fe16b1b84 360be14b0e
commit d8a5ba9b14
86 changed files with 1067 additions and 495 deletions
@@ -159,7 +159,7 @@ class RoomViewStore extends Store {
            }
            case 'sync_state':
                this._setState({
-                    matrixClientIsReady: MatrixClientPeg.get().isInitialSyncComplete(),
+                    matrixClientIsReady: MatrixClientPeg.get() && MatrixClientPeg.get().isInitialSyncComplete(),
                });
                break;
        }