[vlc-devel] commit: Revert "macosx: NSScreen dealloc is not only called at end of execution of course." ( Derk-Jan Hartman )

git version control git at videolan.org
Mon Jun 22 21:03:42 CEST 2009


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Mon Jun 22 20:27:37 2009 +0200| [c226bf881fdab1eb6344655831388ecf43686521] | committer: Derk-Jan Hartman 

Revert "macosx: NSScreen dealloc is not only called at end of execution of course."

This was even worse. +load() != init()
This reverts commit b5feb899d6047e2371ce18fe7d73c51fe270e2a1.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c226bf881fdab1eb6344655831388ecf43686521
---

 modules/gui/macosx/misc.m |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index c9a4c4a..fe57179 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -129,14 +129,13 @@ static NSMutableArray *blackoutWindows = NULL;
 + (void)load
 {
     /* init our fake object attribute */
-    if( !blackoutWindows )
-        blackoutWindows = [NSMutableArray arrayWithCapacity:1];
+    blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1];
 }
 
 - (void)dealloc
 {
-    [blackoutWindows makeObjectsPerformSelector:@selector(close)];
     [blackoutWindows removeAllObjects];
+    [blackoutWindows release];
     [super dealloc];
 }
 




More information about the vlc-devel mailing list