From dd9d6f4ed86df260b6447a4a1d8db5a5ccaeee48 Mon Sep 17 00:00:00 2001 From: Christophe Mutricy Date: Sun, 1 Jun 2008 11:16:57 +0100 Subject: [PATCH] Handles the VLC_EEXITSUCESS case So that vlc --{list,help,module} don't get us a non-null exit code --- src/control/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/control/core.c b/src/control/core.c index b5efae2847..fd305bb9f8 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -104,7 +104,7 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv, libvlc_exception_t *p_e ) { libvlc_instance_t *p_new; - + int i_ret; libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" ); @@ -121,7 +121,10 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv, /** \todo Look for interface settings. If we don't have any, add -I dummy */ /* Because we probably don't want a GUI by default */ - if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) ) + i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ); + if( i_ret == VLC_EEXITSUCCESS ) + return NULL; + else if( i_ret != 0 ) RAISENULL( "VLC initialization failed" ); p_new->p_libvlc_int = p_libvlc_int; -- 2.39.2