From f484449ec61b4a91b7528ced51aca86c08930b1a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 31 Dec 2010 08:50:06 -0800 Subject: [PATCH] Don't crash when resizing non-shaped windows --- src/video/cocoa/SDL_cocoawindow.m | 3 ++- src/video/x11/SDL_x11window.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 4ab0a116d..68c0cbe48 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -117,7 +117,8 @@ - (void)windowDidResize:(NSNotification *)aNotification NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]]; w = (int)rect.size.width; h = (int)rect.size.height; - Cocoa_ResizeWindowShape(_data->window); + if (SDL_IsShapedWindow(_data->window)) + Cocoa_ResizeWindowShape(_data->window); SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h); } diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c index bce684c03..8aac3d2d8 100644 --- a/src/video/x11/SDL_x11window.c +++ b/src/video/x11/SDL_x11window.c @@ -942,7 +942,7 @@ X11_SetWindowSize(_THIS, SDL_Window * window) SDL_WindowData *data = (SDL_WindowData *) window->driverdata; Display *display = data->videodata->display; - if(SDL_IsShapedWindow(window)) + if (SDL_IsShapedWindow(window)) X11_ResizeWindowShape(window); XResizeWindow(display, data->xwindow, window->w, window->h); }