From d7ae313134f2abec908d6f205c196323e6b3b03a Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 31 Aug 2017 21:34:29 -0300 Subject: [PATCH] macOS: Fix menubar items being enabled when they shouldn't be. --- src/video/cocoa/SDL_cocoawindow.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 5572c6a8874a1..659bf92502d28 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -80,14 +80,14 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem if ([menuItem action] == @selector(toggleFullScreen:)) { SDL_Window *window = [self findSDLWindow]; if (window == NULL) { - return YES; + return NO; } else if ((window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_FULLSCREEN_DESKTOP)) != 0) { return NO; } else if ((window->flags & SDL_WINDOW_RESIZABLE) == 0) { return NO; } } - return YES; + return [super validateMenuItem:menuItem]; } - (BOOL)canBecomeKeyWindow