[vlc-devel] commit: Don't crash when using libgmalloc on Leopard (closes #1501) ( Felix Paul Kühne )

git version control git at videolan.org
Wed Mar 26 12:25:10 CET 2008


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Mar 26 12:25:40 2008 +0100| [4a9105ddcf0e3b7b8f7b2db30979d79552edf1e2]

Don't crash when using libgmalloc on Leopard (closes #1501)

Patch by Drew Yao. Thanks and sorry for the long time it took this simple fix to be committed!

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

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

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 9fdfed3..7a98a5c 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -409,11 +409,13 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (id)init
 {
-    if( _o_sharedMainInstance) {
+    if( _o_sharedMainInstance) 
+    {
         [self dealloc];
-    } else {
+        return _o_sharedMainInstance;
+    } 
+    else
         _o_sharedMainInstance = [super init];
-    }
 
     o_about = [[VLAboutBox alloc] init];
     o_prefs = [[VLCPrefs alloc] init];




More information about the vlc-devel mailing list