From 9a1be1a24d53bac3ea0771f8550ec0b337004f42 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 21:54:14 +0000
Subject: [PATCH] Don't try to set crypto options without crypto enabled

---
 src/components/structures/MatrixChat.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a07446d971..323bec4441 100644
--- 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) {