Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-28 11:45:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the viewcontroller from the window when he OpenGL context is destroyed

Browse Source
This commit is contained in:
Sam Lantinga
2012-09-30 01:01:48 -07:00
parent b4ffa7af23
commit adeca7e6a9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/uikit/SDL_uikitopengles.m
View File

@@ -132,15 +132,14 @@ SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window)
[view->viewcontroller setView:view];
[view->viewcontroller retain];
}
[uiwindow addSubview: view];
// The view controller needs to be the root in order to control rotation on iOS 6.0
if (uiwindow.rootViewController == nil) {
uiwindow.rootViewController = view->viewcontroller;
} else {
[uiwindow addSubview: view];
}
if ( UIKit_GL_MakeCurrent(_this, window, view) < 0 ) {
if (UIKit_GL_MakeCurrent(_this, window, view) < 0) {
UIKit_GL_DeleteContext(_this, view);
return NULL;
}
@@ -159,6 +158,10 @@ void UIKit_GL_DeleteContext(_THIS, SDL_GLContext context)
/* the delegate has retained the view, this will release him */
SDL_uikitopenglview *view = (SDL_uikitopenglview *)context;
if (view->viewcontroller) {
UIWindow *uiwindow = (UIWindow *)view.superview;
if (uiwindow.rootViewController == view->viewcontroller) {
uiwindow.rootViewController = nil;
}
[view->viewcontroller setView:nil];
[view->viewcontroller release];
}