vlc | branch: master | David Fuhrmann <[email protected]> | Sat Apr 
14 17:11:35 2012 +0200| [fd9f59ec7cbda944c729118302c7434e5696896a] | committer: 
David Fuhrmann

macosx: fix crash when open track sync panel while movie is playing

Crash was introduced in 3e73ad2a8ab6d5e50ea80025d364edbe7ead1d1b (subsdelay 
filter) and
occurs when user or init methods set subsdelay to 0.

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

 modules/gui/macosx/VideoEffects.m |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/gui/macosx/VideoEffects.m 
b/modules/gui/macosx/VideoEffects.m
index 88e6130..a2d8a72 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -409,6 +409,9 @@ static VLCVideoEffects *_o_sharedInstance = nil;
         else if( (NSInteger)strstr( psz_string, psz_name ) == NO )
             psz_string = (char *)[[NSString stringWithFormat: @"%s:%s", 
psz_string, psz_name] UTF8String];
     } else {
+        if( !psz_string )
+            return;
+
         psz_parser = strstr( psz_string, psz_name );
         if( psz_parser )
         {

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to