We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix for some Cocoa memory management problems.

cocoa-memory-management.patch (text/plain), 1.88 KB, created by Christian Walther on 2007-07-23 01:10:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Walther

Created: 2007-07-23 01:10:30 UTC

Size: 1.88 KB

patch

obsolete

>Index: src/video/quartz/SDL_QuartzVideo.m
>===================================================================
>--- src/video/quartz/SDL_QuartzVideo.m	(revision 3373)
>+++ src/video/quartz/SDL_QuartzVideo.m	(working copy)
>@@ -369,8 +369,8 @@
>         
>         /* If we still have a valid window, close it. */
>         if ( qz_window ) {
>-            [ qz_window close ];
>-            [ qz_window release ];
>+            NSCAssert([ qz_window delegate ] == nil, @"full screen window shouldn't have a delegate"); /* if that should ever change, we'd have to release it here */
>+            [ qz_window close ]; /* includes release because [qz_window isReleasedWhenClosed] */
>             qz_window = nil;
>             window_view = nil;
>         }
>@@ -398,9 +398,9 @@
>     }
>     /* Release window mode resources */
>     else {
>-        
>-        [ qz_window close ];
>-        [ qz_window release ];
>+        id delegate = [ qz_window delegate ];
>+        [ qz_window close ]; /* includes release because [qz_window isReleasedWhenClosed] */
>+        if (delegate != nil) [ delegate release ];
>         qz_window = nil;
>         window_view = nil;
> 
>@@ -747,7 +747,7 @@
>             return NULL;
>         }
>     
>-        /*[ qz_window setReleasedWhenClosed:YES ];*/
>+        /*[ qz_window setReleasedWhenClosed:YES ];*/ /* no need to set this as it's the default for NSWindows */
>         QZ_SetCaption(this, this->wm_title, this->wm_icon);
>         [ qz_window setAcceptsMouseMovedEvents:YES ];
>         [ qz_window setViewsNeedDisplay:NO ];
>@@ -755,7 +755,7 @@
>             [ qz_window center ];
>         }
>         [ qz_window setDelegate:
>-            [ [ [ SDL_QuartzWindowDelegate alloc ] init ] autorelease ] ];
>+            [ [ SDL_QuartzWindowDelegate alloc ] init ] ];
>         [ qz_window setContentView: [ [ [ SDL_QuartzView alloc ] init ] autorelease ] ];
>     }
>     /* We already have a window, just change its size */

Actions: View | Diff

Attachments on bug 458: 231

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.