From 72df873f48658ebe9233a0c0e700e2f2dfc71bd9 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 31 Jul 2017 20:52:25 -0300 Subject: [PATCH] [FIX] Error when acessing settings before ready --- packages/rocketchat-ui-master/client/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index ad47ade5c67a..2a2b9efe015d 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -129,7 +129,8 @@ Template.main.helpers({ subsReady() { const routerReady = FlowRouter.subsReady('userData', 'activeUsers'); const subscriptionsReady = CachedChatSubscription.ready.get(); - const ready = (Meteor.userId() == null) || (routerReady && subscriptionsReady); + const settingsReady = RocketChat.settings.cachedCollection.ready.get(); + const ready = (Meteor.userId() == null) || (routerReady && subscriptionsReady && settingsReady); RocketChat.CachedCollectionManager.syncEnabled = ready; return ready; },