From 5d6a447620ff320f490bdcdf846091003ede3a4f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 22 Feb 2018 18:45:52 +0000
Subject: [PATCH] Fix bug where global "Never send to unverified..." is ignored
---
src/Lifecycle.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index efd5c20d5c..ec1fca2bc6 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -362,7 +362,7 @@ async function _doSetLoggedIn(credentials, clearStorage) {
dis.dispatch({action: 'on_logged_in', teamToken: teamToken});
});
- startMatrixClient();
+ await startMatrixClient();
return MatrixClientPeg.get();
}
@@ -423,7 +423,7 @@ export function logout() {
* Starts the matrix client and all other react-sdk services that
* listen for events while a session is logged in.
*/
-function startMatrixClient() {
+async function startMatrixClient() {
console.log(`Lifecycle: Starting MatrixClient`);
// dispatch this before starting the matrix client: it's used
@@ -437,7 +437,7 @@ function startMatrixClient() {
Presence.start();
DMRoomMap.makeShared().start();
- MatrixClientPeg.start();
+ await MatrixClientPeg.start();
// dispatch that we finished starting up to wire up any other bits
// of the matrix client that cannot be set prior to starting up.