From 697041f622fae3788f23214ec0098ede13de7706 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 9 Sep 2009 22:37:21 +0300 Subject: [PATCH] vlc: only print error message if LibVLC is initialized --- bin/vlc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/bin/vlc.c b/bin/vlc.c index b175439ef8..4582318f88 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -49,8 +49,6 @@ extern char *FromLocale (const char *); *****************************************************************************/ int main( int i_argc, const char *ppsz_argv[] ) { - int i_ret; - #ifdef __APPLE__ /* The so-called POSIX-compliant MacOS X is not. * SIGPIPE fires even when it is blocked in all threads! */ @@ -159,17 +157,14 @@ int main( int i_argc, const char *ppsz_argv[] ) libvlc_add_intf (vlc, NULL, &ex); libvlc_playlist_play (vlc, -1, 0, NULL, &dummy); libvlc_wait (vlc); + + if (libvlc_exception_raised (&ex)) + fprintf( stderr, "%s\n", libvlc_errmsg() ); libvlc_release (vlc); } - i_ret = libvlc_exception_raised (&ex); - if( i_ret ) - fprintf( stderr, "%s\n", libvlc_errmsg() ); - - libvlc_exception_clear (&ex); - libvlc_exception_clear (&dummy); for (int i = 0; i < argc; i++) LocaleFree (argv[i]); - return i_ret; + return vlc == NULL || libvlc_exception_raised (&ex); } -- 2.39.2