Skip to content

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

Fix one segfault when systray is not used 

Remove useless tests
parent a117ab7f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/gui/qt4/main_interface.cpp
View file @ 3be4e19f
......@@ -188,7 +188,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Naming in the controller */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) );
if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray )
if( sysTray )
{
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
updateSystrayTooltipName( QString ) );
......@@ -201,7 +201,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* PLAY_STATUS */
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,
updateSystrayTooltipStatus( int ) );
......@@ -887,7 +887,7 @@ void MainInterface::setName( QString name )
void MainInterface::setStatus( int status )
{
controls->setStatus( status );
if( systrayMenu )
if( sysTray )
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