From 3cafd0ac8fca5ec124e32470cfdeeaf03e21b0c4 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Fri, 3 Nov 2017 11:46:00 +0000
Subject: [PATCH] Refine deactivate logic, only if member via token and not
 otherwise

---
 .../review-panel/controllers/ReviewPanelController.coffee   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index d69aba4208..65b2adf5df 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -640,7 +640,11 @@ define [
 					_setUserTCState(ide.$scope.user.id, newValue, isLocal)
 			else
 				$scope.reviewPanel.trackChangesOnForGuests = false
-				if $scope.isTokenMember
+				if (
+					$scope.isTokenMember &&
+					$scope.user?.id? &&
+					!_.any($scope.project.members, (m) -> m._id == $scope.user.id)
+				)
 					$scope.trackChangesOnForThisGuestClient = false
 					_setUserTCState(ide.$scope.user.id, false, isLocal)