Skip to content

V
vlc-2-2
Commit 6c948b6d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Avoid a call to unsetenv/putenv on Qt4.6 

This trick does not work with Qt <= 4.5 unfortunately.
parent f0d55dab
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
bin/vlc.c
View file @ 6c948b6d
...@@ -75,6 +75,12 @@ int main( int i_argc, const char *ppsz_argv[] ) ...@@ -75,6 +75,12 @@ int main( int i_argc, const char *ppsz_argv[] )
* use the alpha channel for the embedded video window. */ * use the alpha channel for the embedded video window. */
putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" ); putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
#endif #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 #ifndef ALLOW_RUN_AS_ROOT
if (geteuid () == 0) if (geteuid () == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment