Fix the KDE open file dialog KIO scheduler crash avoidance hack

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index e486040ff5af9dab18d210a8849a297490c5f741..d6fc5a820fa3f43ab0ea728f07d3e948f9de8bbc 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -42,6 +42,7 @@
 /* Explicit HACK */
 extern void LocaleFree (const char *);
 extern char *FromLocale (const char *);
+extern void vlc_enable_override (void);
 
 #include <signal.h>
 #include <time.h>
@@ -74,6 +75,12 @@ int main( int i_argc, const char *ppsz_argv[] )
      * use the alpha channel for the embedded video window. */
     putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
 #endif
+#ifdef HAVE_SETENV
+    /* Clear the X.Org startup notification ID. Otherwise the UI might try to
+     * change the environment while the process is multi-threaded. That could
+     * crash. Screw you X.Org. Next time write a thread-safe specification. */
+    unsetenv ("DESKTOP_STARTUP_ID");
+#endif
 
 #ifndef ALLOW_RUN_AS_ROOT
     if (geteuid () == 0)
@@ -157,6 +164,8 @@ int main( int i_argc, const char *ppsz_argv[] )
             return 1; // BOOM!
     argv[argc] = NULL;
 
+    vlc_enable_override ();
+
     /* Initialize libvlc */
     libvlc_instance_t *vlc = libvlc_new (argc, argv);
 
@@ -181,9 +190,10 @@ int main( int i_argc, const char *ppsz_argv[] )
 #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)
+    if (dlopen ("libkio.so.5", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
     {
-        fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
+        fprintf (stderr, "KIO present. Unclean shutdown!\n"
+           " (see http://bugs.kde.org/show_bug.cgi?id=234484 for details)\n");
         _exit (0);
     }
 #endif