Merge pull request #8514 from RocketChat/hotfix/uncessary-route-reload

[FIX] Uncessary route reload break some routes
RocketChat · Oct 17, 2017 · 737abc3 · 737abc3
2 parents 50cce81 + 3f96466
commit 737abc3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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();
+			}
 		}
 	});