Commit 0443fd0a authored by Kees Bakker's avatar Kees Bakker

Use a small function to release UIScreenMode after checking it is supported

parent 811c7fe0
...@@ -242,6 +242,19 @@ UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) ...@@ -242,6 +242,19 @@ UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
return 0; return 0;
} }
static void
UIKit_ReleaseUIScreenMode(SDL_DisplayMode * mode)
{
if (!SDL_UIKit_supports_multiple_displays) {
// Not on at least iPhoneOS 3.2 (versions prior to iPad).
SDL_assert(mode->driverdata == NULL);
} else {
UIScreenMode *uimode = (UIScreenMode *) mode->driverdata;
[uimode release];
mode->driverdata = NULL;
}
}
void void
UIKit_VideoQuit(_THIS) UIKit_VideoQuit(_THIS)
{ {
...@@ -252,14 +265,11 @@ UIKit_VideoQuit(_THIS) ...@@ -252,14 +265,11 @@ UIKit_VideoQuit(_THIS)
UIScreen *uiscreen = (UIScreen *) display->driverdata; UIScreen *uiscreen = (UIScreen *) display->driverdata;
[uiscreen release]; [uiscreen release];
display->driverdata = NULL; display->driverdata = NULL;
[((UIScreenMode *) display->desktop_mode.driverdata) release]; UIKit_ReleaseUIScreenMode(&display->desktop_mode);
display->desktop_mode.driverdata = NULL; UIKit_ReleaseUIScreenMode(&display->current_mode);
[((UIScreenMode *) display->current_mode.driverdata) release];
display->current_mode.driverdata = NULL;
for (j = 0; j < display->num_display_modes; j++) { for (j = 0; j < display->num_display_modes; j++) {
SDL_DisplayMode *mode = &display->display_modes[j]; SDL_DisplayMode *mode = &display->display_modes[j];
[((UIScreenMode *) mode->driverdata) release]; UIKit_ReleaseUIScreenMode(mode);
mode->driverdata = NULL;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment