From 44afc2a3057c3039c590bb7cd1ec4abeb211b2c6 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 6 Dec 2013 16:12:18 -0800 Subject: [PATCH] Fixed crash if no window has keyboard focus --- src/video/cocoa/SDL_cocoamousetap.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/video/cocoa/SDL_cocoamousetap.m b/src/video/cocoa/SDL_cocoamousetap.m index 8f95ac3515896..5b61270f58b40 100644 --- a/src/video/cocoa/SDL_cocoamousetap.m +++ b/src/video/cocoa/SDL_cocoamousetap.m @@ -63,7 +63,7 @@ SDL_MouseEventTapData *tapdata = (SDL_MouseEventTapData*)refcon; SDL_Mouse *mouse = SDL_GetMouse(); SDL_Window *window = SDL_GetKeyboardFocus(); - NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; + NSWindow *nswindow; NSRect windowRect; CGPoint eventLocation; @@ -93,6 +93,7 @@ } /* This is the same coordinate system as Cocoa uses. */ + nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; eventLocation = CGEventGetUnflippedLocation(event); windowRect = [nswindow contentRectForFrameRect:[nswindow frame]];