# HG changeset patch # User Holmes Futrell # Date 1218660981 0 # Node ID d92493ff1b51d2b9e8d8d380a9c02c8c8d6d331e # Parent 93fd226af6d09b547bdd3cd8aedd5af39a5322e0 Fixed a bug where bad access would occur if UIKIT_MakeCurrent is passed NULL for the parameter 'SDL_GLContext context'. Instead, it clears the current context. diff -r 93fd226af6d0 -r d92493ff1b51 src/video/uikit/SDL_uikitopengles.m --- a/src/video/uikit/SDL_uikitopengles.m Wed Aug 13 18:16:27 2008 +0000 +++ b/src/video/uikit/SDL_uikitopengles.m Wed Aug 13 20:56:21 2008 +0000 @@ -41,12 +41,20 @@ return SDL_LoadFunction(RTLD_DEFAULT, proc); } +/* + note that SDL_GL_Delete context makes it current without passing the window +*/ int UIKit_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) { - SDL_WindowData *data = (SDL_WindowData *)window->driverdata; - - [data->view setCurrentContext]; + if (context) { + SDL_WindowData *data = (SDL_WindowData *)window->driverdata; + [data->view setCurrentContext]; + } + else { + [EAGLContext setCurrentContext: nil]; + } + return 0; }