From 841aa4b80089510b290bda79dffedcb86498d45d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 17 Sep 2018 19:28:06 +0200
Subject: [PATCH] check LL with client as this takes server support into
 account

---
 src/components/structures/RoomView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1a1dd4cf87..7996c0eab8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -590,8 +590,8 @@ module.exports = React.createClass({
 
     _loadMembersIfJoined: async function(room) {
         // lazy load members if enabled
-        if (SettingsStore.isFeatureEnabled('feature_lazyloading')) {
-            const cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
+        if (cli.hasLazyLoadMembersEnabled()) {
             if (room && room.getMyMembership() === 'join') {
                 try {
                     await room.loadMembersIfNeeded();