Merge pull request #1334 from ychin/fix-tab-bar-crash

ychin · web-flow · commit d809b1ed0731 · 2022-11-03T16:01:44.000-07:00
Fix opening a tab crashing MacVim
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`