From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 9 Sep 2009 19:37:21 +0000 (+0300)
Subject: vlc: only print error message if LibVLC is initialized
X-Git-Tag: 1.1.0-ff~3423
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=697041f622fae3788f23214ec0098ede13de7706

vlc: only print error message if LibVLC is initialized
---

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);
 }