Don't try to set crypto options without crypto enabled

matrix-org · Jan 13, 2020 · 9a1be1a · 9a1be1a
1 parent e47240d
commit 9a1be1a
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
@@ -1505,16 +1505,17 @@ export default createReactClass({
                 "blacklistUnverifiedDevices",
             );
             cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
+
+            // With cross-signing enabled, we send to unknown devices
+            // without prompting. Any bad-device status the user should
+            // be aware of will be signalled through the room shield
+            // changing colour. More advanced behaviour will come once
+            // we implement more settings.
+            cli.setGlobalErrorOnUnknownDevices(
+                !SettingsStore.isFeatureEnabled("feature_cross_signing"),
+            );
         }
 
-        // With cross-signing enabled, we send to unknown devices
-        // without prompting. Any bad-device status the user should
-        // be aware of will be signalled through the room shield
-        // changing colour. More advanced behaviour will come once
-        // we implement more settings.
-        cli.setGlobalErrorOnUnknownDevices(
-            !SettingsStore.isFeatureEnabled("feature_cross_signing"),
-        );
     },
 
     showScreen: function(screen, params) {