From ddd6a735bbd3da95094e44635932a1d6b833d63c Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 17 Oct 2017 12:03:05 -0200 Subject: [PATCH] Merge pull request #8514 from RocketChat/hotfix/uncessary-route-reload [FIX] Uncessary route reload break some routes --- packages/rocketchat-ui/client/lib/RoomManager.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js index 6b9fa703108..af895ee9d5d 100644 --- a/packages/rocketchat-ui/client/lib/RoomManager.js +++ b/packages/rocketchat-ui/client/lib/RoomManager.js @@ -265,7 +265,12 @@ Meteor.startup(() => { if ((currentUsername === undefined) && ((user != null ? user.username : undefined) != null)) { currentUsername = user.username; RoomManager.closeAllRooms(); - FlowRouter.reload(); + const roomTypes = RocketChat.roomTypes.roomTypes; + // Reload only if the current route is a channel route + const roomType = Object.keys(roomTypes).find(key => roomTypes[key].route && roomTypes[key].route.name === FlowRouter.current().route.name); + if (roomType) { + FlowRouter.reload(); + } } });