Merge branch 'poljar/seshat-filepanel' into develop

2020-01-24 14:44:24 +01:00
parent 7de5f09f9f 37f289b120
commit cbfde4d78f
5 changed files with 384 additions and 38 deletions
@@ -592,8 +592,11 @@ async function startMatrixClient(startSyncing=true) {
    Mjolnir.sharedInstance().start();

    if (startSyncing) {
-        await MatrixClientPeg.start();
+        // The client might want to populate some views with events from the
+        // index (e.g. the FilePanel), therefore initialize the event index
+        // before the client.
        await EventIndexPeg.init();
+        await MatrixClientPeg.start();
    } else {
        console.warn("Caller requested only auxiliary services be started");
        await MatrixClientPeg.assign();