Commit 4fb6ff3e authored by Christophe Mutricy's avatar Christophe Mutricy

qt4: Don't try to use the qt intf if we don't have an X

parent 614d104e
...@@ -75,6 +75,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -75,6 +75,13 @@ static int Open( vlc_object_t *p_this )
return VLC_ENOMEM; return VLC_ENOMEM;
} }
memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) ); memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
#ifdef HAVE_GETENV
if( !getenv( "DISPLAY" ) )
{
msg_Err(p_intf, "no X server");
return VLC_EGENERIC;
}
#endif
p_intf->p_sys->p_playlist = pl_Yield( p_intf ); p_intf->p_sys->p_playlist = pl_Yield( p_intf );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
...@@ -124,8 +131,9 @@ static void Init( intf_thread_t *p_intf ) ...@@ -124,8 +131,9 @@ static void Init( intf_thread_t *p_intf )
char *argv[] = { "" }; char *argv[] = { "" };
int argc = 1; int argc = 1;
Q_INIT_RESOURCE( vlc ); Q_INIT_RESOURCE( vlc );
msg_Err(p_intf,"before Qapplication constructor");
QApplication *app = new QApplication( argc, argv , true ); QApplication *app = new QApplication( argc, argv , true );
msg_Err(p_intf,"after constructoe");
app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app; p_intf->p_sys->p_app = app;
......
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