Do not stuck in login page after logout

Closes #3761
9 years ago · 3f5d971263
parent cdf0d698e8
commit 3f5d971263
1 changed files with 4 additions and 1 deletions
--- 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