From 3f5d971263121cf101067b0ccb157f10fcea5d78 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 4 Oct 2016 21:15:39 -0300 Subject: [PATCH] Do not stuck in login page after logout Closes #3761 --- packages/rocketchat-ui-master/master/main.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee index a14de7c6955..dffea890c07 100644 --- a/packages/rocketchat-ui-master/master/main.coffee +++ b/packages/rocketchat-ui-master/master/main.coffee @@ -150,7 +150,10 @@ Template.main.helpers return RocketChat.iframeLogin.reactiveIframeUrl.get() subsReady: -> - ready = not Meteor.userId()? or (FlowRouter.subsReady('userData', 'activeUsers') and CachedChatSubscription.ready.get()) + routerReady = FlowRouter.subsReady('userData', 'activeUsers') + subscriptionsReady = CachedChatSubscription.ready.get() + + ready = not Meteor.userId()? or (routerReady and subscriptionsReady) RocketChat.CachedCollectionManager.syncEnabled = ready return ready