From e273b164018da2474055ba69bb6ec26e3210f6b0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 19 Feb 2020 22:56:10 -0800 Subject: [PATCH] Changed to NSMenuItem's parentItem (added in 10.6) rather than the locally declared superitem. --- src/main-cocoa.m | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main-cocoa.m b/src/main-cocoa.m index 2d4084750..3b79ef6a9 100644 --- a/src/main-cocoa.m +++ b/src/main-cocoa.m @@ -1504,15 +1504,6 @@ static size_t Term_mbcs_cocoa(wchar_t *dest, const char *src, int n) } -static NSMenuItem *superitem(NSMenuItem *self) -{ - NSMenu *supermenu = [[self menu] supermenu]; - int index = [supermenu indexOfItemWithSubmenu:[self menu]]; - if (index == -1) return nil; - else return [supermenu itemAtIndex:index]; -} - - - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { int tag = [menuItem tag]; @@ -4089,7 +4080,8 @@ static void hook_quit(const char * str) { return ! game_in_progress; } - else if (sel == @selector(setRefreshRate:) && [superitem(menuItem) tag] == 150) + else if (sel == @selector(setRefreshRate:) && + [[menuItem parentItem] tag] == 150) { NSInteger fps = [[NSUserDefaults standardUserDefaults] integerForKey:AngbandFrameRateDefaultsKey]; [menuItem setState: ([menuItem tag] == fps)]; -- 2.11.0