X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=154b57104993c2bad4920b931a598b8d51ae8866;hb=7e413aa7c9d60c30c86a7cd84862fc14f4920c83;hp=97ea6266bd8901fde3f6c1b261cece1abf0f4363;hpb=5e15258c9ef28558fe2abc941fc1527e02b04c21;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 97ea6266bd..154b571049 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -235,9 +235,6 @@ static int Open( vlc_object_t *p_this ) p_intf->p_sys->p_playlist = pl_Yield( p_intf ); p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); - /* We support play on start */ - p_intf->b_play = true; - return VLC_SUCCESS; } @@ -256,9 +253,9 @@ static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - vlc_mutex_lock( &p_intf->object_lock ); + vlc_object_lock( p_intf ); p_intf->b_dead = true; - vlc_mutex_unlock( &p_intf->object_lock ); + vlc_object_unlock( p_intf ); if( p_intf->p_sys->b_isDialogProvider ) { @@ -353,12 +350,6 @@ static void Init( intf_thread_t *p_intf ) app->installTranslator( &qtTranslator ); #endif //ENABLE_NLS - /* Start playing if needed */ - if( !p_intf->pf_show_dialog && p_intf->b_play ) - { - playlist_Control( THEPL, PLAYLIST_PLAY, false ); - } - /* Explain to the core how to show a dialog :D */ p_intf->pf_show_dialog = ShowDialog;