Commit 3be4e19f authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

Fix one segfault when systray is not used

Remove useless tests
parent a117ab7f
...@@ -188,7 +188,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -188,7 +188,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Naming in the controller */ /* Naming in the controller */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) ); setName( QString ) );
if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray ) if( sysTray )
{ {
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
updateSystrayTooltipName( QString ) ); updateSystrayTooltipName( QString ) );
...@@ -201,7 +201,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -201,7 +201,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* PLAY_STATUS */ /* PLAY_STATUS */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray ) if( sysTray )
{ {
CONNECT( THEMIM->getIM(), statusChanged( int ), this, CONNECT( THEMIM->getIM(), statusChanged( int ), this,
updateSystrayTooltipStatus( int ) ); updateSystrayTooltipStatus( int ) );
...@@ -887,7 +887,7 @@ void MainInterface::setName( QString name ) ...@@ -887,7 +887,7 @@ void MainInterface::setName( QString name )
void MainInterface::setStatus( int status ) void MainInterface::setStatus( int status )
{ {
controls->setStatus( status ); controls->setStatus( status );
if( systrayMenu ) if( sysTray )
updateSystrayMenu( status ); updateSystrayMenu( status );
} }
......
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