From f222f159c3fb5f256fb878aa900236945c41391c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 15 Apr 2009 22:55:08 +0300 Subject: [PATCH] Do not pass custom Xlib display to Qt4 - fixes #2322 --- modules/gui/qt4/qt4.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 389f53facf..b66626e0bd 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -368,10 +368,15 @@ static void *Thread( void *obj ) /* Start the QApplication here */ #ifdef Q_WS_X11 - QVLCApp app( (Display *)p_intf->p_sys->display, argc, argv ); -#else - QVLCApp app( argc, argv ); + char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" ); + if( display ) + { + argv[argc++] = const_cast("-display"); + argv[argc++] = display; + argv[argc] = NULL; + } #endif + QVLCApp app( argc, argv ); p_intf->p_sys->p_app = &app; @@ -505,6 +510,7 @@ static void *Thread( void *obj ) free( psz_path ); /* Delete the application automatically */ + free( display ); return NULL; } -- 2.39.2