Merge branch 'poljar/seshat-filepanel' into develop
This commit is contained in:
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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue