Skip to content

V
vlc-gpu
Commit f765c772 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: fix a potential crash with the systray management

parent eff056b1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
modules/gui/qt4/main_interface.cpp
View file @ f765c772
...@@ -1044,9 +1044,11 @@ void MainInterface::toggleUpdateSystrayMenu() ...@@ -1044,9 +1044,11 @@ void MainInterface::toggleUpdateSystrayMenu()
hide(); hide();
#endif #endif
} }
QVLCMenu::updateSystrayMenu( this, p_intf ); if( sysTray )
QVLCMenu::updateSystrayMenu( this, p_intf );
} }
/* First Item of the systray menu */
void MainInterface::showUpdateSystrayMenu() void MainInterface::showUpdateSystrayMenu()
{ {
if( isHidden() ) if( isHidden() )
...@@ -1058,12 +1060,14 @@ void MainInterface::showUpdateSystrayMenu() ...@@ -1058,12 +1060,14 @@ void MainInterface::showUpdateSystrayMenu()
QVLCMenu::updateSystrayMenu( this, p_intf ); QVLCMenu::updateSystrayMenu( this, p_intf );
} }
/* First Item of the systray menu */
void MainInterface::hideUpdateSystrayMenu() void MainInterface::hideUpdateSystrayMenu()
{ {
hide(); hide();
QVLCMenu::updateSystrayMenu( this, p_intf ); QVLCMenu::updateSystrayMenu( this, p_intf );
} }
/* Click on systray Icon */
void MainInterface::handleSystrayClick( void MainInterface::handleSystrayClick(
QSystemTrayIcon::ActivationReason reason ) QSystemTrayIcon::ActivationReason reason )
{ {
......
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