X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fvlc.c;h=b175439ef8344133170bbee6a054f246c1fe4f57;hb=d63c187cd8daa82e388ef54195ddc72b74795558;hp=3a15722d77e4f8094a75c27784026f8e1c368721;hpb=0e1e17e1b8f59fcb95897a7cf53e078c19430eb3;p=vlc

diff --git a/bin/vlc.c b/bin/vlc.c
index 3a15722d77..b175439ef8 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -51,6 +51,12 @@ 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! */
+    signal (SIGPIPE, SIG_IGN);
+#endif
+
 #ifndef ALLOW_RUN_AS_ROOT
     if (geteuid () == 0)
     {
@@ -73,9 +79,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 #   ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
     putenv( (char*)"MALLOC_CHECK_=2" );
-#       ifdef __APPLE__
-    putenv( (char*)"MallocErrorAbort=crash_my_baby_crash" );
-#       endif
 
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
     putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
@@ -151,6 +154,8 @@ int main( int i_argc, const char *ppsz_argv[] )
             libvlc_exception_clear (&ex);
             pthread_sigmask (SIG_UNBLOCK, &set, NULL);
         }
+        libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
+        libvlc_exception_clear (&ex);
         libvlc_add_intf (vlc, NULL, &ex);
         libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
         libvlc_wait (vlc);
@@ -158,7 +163,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     }
     i_ret = libvlc_exception_raised (&ex);
     if( i_ret )
-        fprintf( stderr, "%s\n", libvlc_exception_get_message( &ex));
+        fprintf( stderr, "%s\n", libvlc_errmsg() );
 
     libvlc_exception_clear (&ex);
     libvlc_exception_clear (&dummy);