From d37935dd787a9af897201c8af91eb4bdabb5647a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 21 Jan 2017 17:51:48 +0000
Subject: [PATCH] actually consider _crypto.getGlobalBlacklistUnverifiedDevices

---
 src/crypto/algorithms/megolm.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/crypto/algorithms/megolm.js b/src/crypto/algorithms/megolm.js
index 7ad303a1e..d583e56c3 100644
--- a/src/crypto/algorithms/megolm.js
+++ b/src/crypto/algorithms/megolm.js
@@ -490,7 +490,8 @@ MegolmEncryption.prototype._getDevicesInRoom = function(room) {
 
                 if (userDevices[deviceId].isBlocked() ||
                     (userDevices[deviceId].isUnverified() &&
-                     room.getBlacklistUnverifiedDevices()))
+                     (room.getBlacklistUnverifiedDevices() ||
+                      this._crypto.getGlobalBlacklistUnverifiedDevices())))
                 {
                     delete userDevices[deviceId];
                 }