Use var_Inherit* instead of var_CreateGet*.

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 25fcf51644e4f4330b44740c08c08afb2518ff9a..085aa3afda453b37dd9cf8422b42c05b5c55c5b3 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -203,7 +203,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     if (vlc == NULL)
         goto out;
 
-    libvlc_set_user_agent (vlc, "VLC media player", NULL);
+    libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
 
 #if !defined (HAVE_MAEMO) && !defined __APPLE__
     libvlc_add_intf (vlc, "globalhotkeys,none");
@@ -242,15 +242,8 @@ out:
     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 ("libkio.so.5", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
-    {
-        fprintf (stderr, "KIO present. Unclean shutdown!\n"
-           " (see http://bugs.kde.org/show_bug.cgi?id=234484 for details)\n");
-        _exit (0);
-    }
-#endif
-    return 0;
+    /* Do not run exit handlers. Some of them are buggy (e.g. KDE IO scheduler)
+     * and crash. Also some will crash because their library may be already
+     * unloaded (dlclose()). */
+    _exit (0);
 }