vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> | Sat Apr 14 17:11:35 2012 +0200| [59947987d91dbae6fff33d02342976d1a74db073] | committer: Felix Paul Kühne
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. (cherry picked from commit fd9f59ec7cbda944c729118302c7434e5696896a) Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=59947987d91dbae6fff33d02342976d1a74db073 --- 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
