diff --git a/bin/vlc.c b/bin/vlc.c index 198f28fd31..9546077832 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -234,8 +234,9 @@ int main( int i_argc, const char *ppsz_argv[] ) /* Initialize libvlc */ libvlc_instance_t *vlc = libvlc_new (argc, argv); if (vlc == NULL) - goto out; + return 1; + int ret = 1; libvlc_set_exit_handler (vlc, vlc_kill, &self); libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION); @@ -275,15 +276,13 @@ int main( int i_argc, const char *ppsz_argv[] ) pthread_sigmask (SIG_UNBLOCK, &set, NULL); alarm (3); + ret = 0; /* Cleanup */ out: - if (vlc != NULL) - libvlc_release (vlc); - + libvlc_release (vlc); #ifdef __OS2__ for (int i = 2; i < argc; i++) free (argv[i]); #endif - - return 0; + return ret; }