[vlc-devel] commit: Qt4: use --x11-display ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Feb  2 23:16:19 2009 +0200| [a33c431deacf55c728602118989ffd7be8faa3a0] | committer: Rémi Denis-Courmont 

Qt4: use --x11-display

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a33c431deacf55c728602118989ffd7be8faa3a0
---

 modules/gui/qt4/qt4.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 6c55915..15a8f88 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -260,9 +260,9 @@ static int Open( vlc_object_t *p_this )
     intf_sys_t *p_sys;
 
 #ifdef Q_WS_X11
-    /* Thanks for libqt4 calling exit() in QApplication::QApplication()
-     * instead of returning an error, we have to check the X11 display */
-    Display *p_display = XOpenDisplay( NULL );
+    char *psz_display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+    Display *p_display = XOpenDisplay( psz_display );
+    free( psz_display );
     if( !p_display )
     {
         msg_Err( p_intf, "Could not connect to X server" );