Merge pull request #7622 from RocketChat/hotfix/acessing-settings-bef…

…ore-ready [FIX] Error when acessing settings before ready
RocketChat · Aug 1, 2017 · e461bdb · e461bdb
2 parents dd77b12 + 72df873
commit e461bdb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;
 	},