Try retaining _original_nextKeyView

gnustep · Apr 24, 2024 · d563116 · d563116
1 parent d0c415f
commit d563116
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Source/NSTabView.m b/Source/NSTabView.m
@@ -78,6 +78,7 @@ - (id) initWithFrame: (NSRect)rect
       ASSIGN(_items, [NSMutableArray array]);
       ASSIGN(_font, [NSFont systemFontOfSize: 0]);
       _selected = nil;
+      _original_nextKeyView = nil;
       //_truncated_label = NO;
     }
 
@@ -91,6 +92,7 @@ - (void) dealloc
   _selected = nil;
   RELEASE(_items);
   RELEASE(_font);
+  RELEASE(_original_nextKeyView);
   [super dealloc];
 }
 
@@ -285,7 +287,7 @@ - (void) selectTabViewItem: (NSTabViewItem*)tabViewItem
 	      [firstResponder _setUpKeyViewLoopWithNextKeyView:
 		_original_nextKeyView];
 	    }
-	  [super setNextKeyView: firstResponder];
+	  [self setNextKeyView: firstResponder];
           [_window makeFirstResponder: firstResponder];
         }
 
@@ -738,7 +740,8 @@ - (void) _setUpKeyViewLoopWithNextKeyView: (NSView *)nextKeyView
 
 - (void) setNextKeyView: (NSView *)nextKeyView
 {
-  _original_nextKeyView = nextKeyView;
+  [_original_nextKeyView autorelease];
+  _original_nextKeyView = [nextKeyView retain];
   if (_selected)
     {
       [[_selected _lastKeyView] setNextKeyView: nextKeyView];