Merge pull request #1361 from ychin/fix-tab-remaining-tracking-tag-crash

ychin · web-flow · commit 76b9df28ea8d · 2023-02-07T02:34:28.000-08:00
Fix remaining tab crash from not clearing tracking tags correctly
diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m
@@ -476,9 +476,11 @@ - (void)removeTabForCell:(PSMTabBarCell *)cell
     [[NSNotificationCenter defaultCenter] removeObserver:cell];
     if([cell closeButtonTrackingTag] != 0){
         [self removeTrackingRect:[cell closeButtonTrackingTag]];
+        [cell setCloseButtonTrackingTag:0];
     }
     if([cell cellTrackingTag] != 0){
         [self removeTrackingRect:[cell cellTrackingTag]];
+        [cell setCellTrackingTag:0];
     }
 
     // pull from collection
@@ -665,9 +667,11 @@ - (void)update
         [[NSNotificationCenter defaultCenter] removeObserver:cell];
         if([cell closeButtonTrackingTag] != 0){
             [self removeTrackingRect:[cell closeButtonTrackingTag]];
+            [cell setCloseButtonTrackingTag:0];
         }
         if([cell cellTrackingTag] != 0){
             [self removeTrackingRect:[cell cellTrackingTag]];
+            [cell setCellTrackingTag:0];
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -476,9 +476,11 @@ - (void)removeTabForCell:(PSMTabBarCell *)cell`
`476`	`476`	`[[NSNotificationCenter defaultCenter] removeObserver:cell];`
`477`	`477`	`if([cell closeButtonTrackingTag] != 0){`
`478`	`478`	`[self removeTrackingRect:[cell closeButtonTrackingTag]];`
	`479`	`+ [cell setCloseButtonTrackingTag:0];`
`479`	`480`	`}`
`480`	`481`	`if([cell cellTrackingTag] != 0){`
`481`	`482`	`[self removeTrackingRect:[cell cellTrackingTag]];`
	`483`	`+ [cell setCellTrackingTag:0];`
`482`	`484`	`}`
`483`	`485`
`484`	`486`	`// pull from collection`
`@@ -665,9 +667,11 @@ - (void)update`
`665`	`667`	`[[NSNotificationCenter defaultCenter] removeObserver:cell];`
`666`	`668`	`if([cell closeButtonTrackingTag] != 0){`
`667`	`669`	`[self removeTrackingRect:[cell closeButtonTrackingTag]];`
	`670`	`+ [cell setCloseButtonTrackingTag:0];`
`668`	`671`	`}`
`669`	`672`	`if([cell cellTrackingTag] != 0){`
`670`	`673`	`[self removeTrackingRect:[cell cellTrackingTag]];`
	`674`	`+ [cell setCellTrackingTag:0];`
`671`	`675`	`}`
`672`	`676`	`}`
`673`	`677`