Qt4: use putenv() before any thread is created

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index f9c9eff7a3f535bc9366cbbccb4ebd62b170405a..9ccbdd89401bcc2036c80f0b20ac506dbefa574b 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -47,7 +47,7 @@ extern char *FromLocale (const char *);
 #include <time.h>
 #include <pthread.h>
 #include <unistd.h>
-#include <string.h>
+#include <dlfcn.h>
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
@@ -55,7 +55,7 @@ extern char *FromLocale (const char *);
 int main( int i_argc, const char *ppsz_argv[] )
 {
 #ifdef __APPLE__
-    /* The so-called POSIX-compliant MacOS X is not.
+    /* The so-called POSIX-compliant MacOS X is not. 
      * SIGPIPE fires even when it is blocked in all threads! */
     signal (SIGPIPE, SIG_IGN);
 #endif
@@ -75,8 +75,8 @@ int main( int i_argc, const char *ppsz_argv[] )
 
 #ifndef __APPLE__
     /* This clutters OSX GUI error logs */
-    if (i_argc > 1 && strcmp(ppsz_argv[1], "--quiet")) /* dirty hack to enable really quiet runing of vlc */
-        fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
+    fprintf( stderr, "VLC media player %s (revision %s)\n",
+             libvlc_get_version(), libvlc_get_changeset() );
 #endif
 
 #ifdef HAVE_PUTENV
@@ -89,6 +89,10 @@ int main( int i_argc, const char *ppsz_argv[] )
 #   endif
 #endif
 
+    /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not
+     * use the alpha channel for the embedded video window. */
+    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
+
     /* Synchronously intercepted POSIX signals.
      *
      * In a threaded program such as VLC, the only sane way to handle signals
@@ -173,5 +177,14 @@ int main( int i_argc, const char *ppsz_argv[] )
     for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
+#ifdef RTLD_NOLOAD
+    /* Avoid crash in KIO scheduler cleanup. */
+    /* This is ugly, but we get way too many crash reports due to this. */
+    if (dlopen ("libkfilemodule.so", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
+    {
+        fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
+        _exit (0);
+    }
+#endif
     return 0;
 }