Fix opening a tab crashing MacVim

ychin · ychin · commit cd4bd98304db · 2022-11-03T01:55:34.000-07:00
This seems to be a really old bug but new interactions with macOS (probably due to macOS 13 Ventura) caused it to surface and crash. Previously it was assuming a call to removeTrackingRect must always come only after addTrackingRect was called, which was not a good assumption to make. As a result, we could call this and end up triggering other code in macOS when passing in a 0 tracking tag. Fix #1333
diff --git a/src/MacVim/PSMTabBarControl/source/PSMRolloverButton.m b/src/MacVim/PSMTabBarControl/source/PSMRolloverButton.m
@@ -52,7 +52,9 @@ - (void)addTrackingRect
 
 - (void)removeTrackingRect
 {
-    [self removeTrackingRect:_myTrackingRectTag];
+    if (_myTrackingRectTag != 0)
+        [self removeTrackingRect:_myTrackingRectTag];
+    _myTrackingRectTag = 0;
 }
 
 // override for rollover effect

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ - (void)addTrackingRect`
`52`	`52`
`53`	`53`	`- (void)removeTrackingRect`
`54`	`54`	`{`
`55`		`- [self removeTrackingRect:_myTrackingRectTag];`
	`55`	`+ if (_myTrackingRectTag != 0)`
	`56`	`+ [self removeTrackingRect:_myTrackingRectTag];`
	`57`	`+ _myTrackingRectTag = 0;`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`// override for rollover effect`