Commit 8fd71e10 authored by Rafaël Carré's avatar Rafaël Carré

Unblocks SIGCHLD in qt4 thread

parent 7e772f7d
......@@ -22,10 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef WIN32
# include <signal.h>
#endif
#include <vlc_intf_strings.h>
#include "main_interface.hpp"
......@@ -171,20 +167,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
bool playlist, bool adv_controls_enabled,
bool visual_selector_enabled )
{
#ifndef WIN32
/* Ugly klugde
* Remove SIGCHLD from the ignored signal the time to initialise
* Qt because it call gconf to get the icon theme */
sigset_t set;
sigemptyset( &set );
sigaddset( &set, SIGCHLD );
pthread_sigmask( SIG_UNBLOCK, &set, NULL );
#endif /* WIN32 */
QMenuBar *bar = mi->menuBar();
#ifndef WIN32
pthread_sigmask( SIG_BLOCK, &set, NULL );
#endif /* WIN32 */
BAR_ADD( FileMenu(), qtr("&Media") );
if( playlist )
{
......
......@@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef WIN32
# include <signal.h>
#endif
#include <QApplication>
#include "qt4.hpp"
......@@ -209,7 +213,19 @@ static void Init( intf_thread_t *p_intf )
}
if( p_intf->pf_show_dialog )
{
vlc_thread_ready( p_intf );
#ifndef WIN32
/* unblocks SIGCHLD as that makes the app hang
* when cleanlooks style is used with QT4
* ( exactly when launching gconftool-2 to get the icon theme ) */
sigset_t set;
sigemptyset( &set );
sigaddset( &set, SIGCHLD );
pthread_sigmask( SIG_UNBLOCK, &set, NULL );
#endif
}
/* Start playing if needed */
if( !p_intf->pf_show_dialog && p_intf->b_play )
......
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