gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Fixed lifetime management of application delegate.

Browse Source
This commit is contained in:
Camilla Berglund 2015-01-04 17:49:12 +01:00
parent d459145d28
commit 1634742177
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cocoa_init.m
View File

@ -228,11 +228,11 @@ void _glfwPlatformTerminate(void)
_glfw.ns.eventSource = NULL; _glfw.ns.eventSource = NULL;
} }
id delegate = [NSApp delegate]; if (_glfw.ns.delegate)
if (delegate)
{ {
[delegate release];
[NSApp setDelegate:nil]; [NSApp setDelegate:nil];
[_glfw.ns.delegate release];
_glfw.ns.delegate = nil;
} }
[_glfw.ns.autoreleasePool release]; [_glfw.ns.autoreleasePool release];

1
src/cocoa_platform.h
View File

@ -76,6 +76,7 @@ typedef struct _GLFWwindowNS
typedef struct _GLFWlibraryNS typedef struct _GLFWlibraryNS
{ {
CGEventSourceRef eventSource; CGEventSourceRef eventSource;
id delegate;
id autoreleasePool; id autoreleasePool;
id cursor; id cursor;

6
src/cocoa_window.m
View File

@ -794,15 +794,15 @@ static GLboolean initializeAppKit(void)
// There can only be one application delegate, but we allocate it the // There can only be one application delegate, but we allocate it the
// first time a window is created to keep all window code in this file // first time a window is created to keep all window code in this file
id delegate = [[GLFWApplicationDelegate alloc] init]; _glfw.ns.delegate = [[GLFWApplicationDelegate alloc] init];
if (delegate == nil) if (_glfw.ns.delegate == nil)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Cocoa: Failed to create application delegate"); "Cocoa: Failed to create application delegate");
return GL_FALSE; return GL_FALSE;
} }
[NSApp setDelegate:delegate]; [NSApp setDelegate:_glfw.ns.delegate];
[NSApp run]; [NSApp run];
return GL_TRUE; return GL_TRUE;