From 1ab5ff079c5716677b71302d91f5f025766fb352 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 16 Nov 2017 20:50:29 -0700 Subject: [PATCH] Set the SdkConfig values immediately after loading the config This is to ensure that when we make a call to get the theme we'll have the SdkConfig available. Signed-off-by: Travis Ralston --- src/vector/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vector/index.js b/src/vector/index.js index 2b27d4e4c..83e71f684 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -79,6 +79,7 @@ import Platform from './platform'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import SettingsStore, {SettingLevel} from "matrix-react-sdk/lib/settings/SettingsStore"; import Tinter from 'matrix-react-sdk/lib/Tinter'; +import SdkConfig from "matrix-react-sdk/lib/SdkConfig"; var lastLocationHashSet = null; @@ -295,6 +296,7 @@ async function loadApp() { } catch (e) { configError = e; } + SdkConfig.put(configJson); // as quickly as we possibly can, set a default theme... const styleElements = Object.create(null);