Merge remote-tracking branch 'origin/develop' into develop

2017-11-27 18:07:14 +00:00
parent 88917c77bc 81ae081f15
commit 293f17a710
1 changed files with 1 additions and 1 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -891,7 +891,7 @@ module.exports = React.createClass({
     */
    _onSetTheme: function(theme) {
        if (!theme) {
-            theme = SettingsStore.getValueAt(SettingLevel.DEFAULT, "theme");
+            theme = SettingsStore.getValue("theme");
        }

        // look for the stylesheet elements.