StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(systemtrayicon): only delete the systray backend that was used

Browse Source 
Fixes qTox not closing cleanly after
4fd0446f96
This commit is contained in:
sudden6 2016-04-13 22:32:45 +02:00
parent 01c56a3af6
commit 1d6f32c9f9
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/widget/systemtrayicon.cpp
View File

@ -99,19 +99,33 @@ SystemTrayIcon::SystemTrayIcon()
SystemTrayIcon::~SystemTrayIcon() SystemTrayIcon::~SystemTrayIcon()
{ {
delete qtIcon; // only delete the used backend
switch(backendType)
{
case SystrayBackendType::Qt:
delete qtIcon;
break;
#ifdef ENABLE_SYSTRAY_UNITY_BACKEND #ifdef ENABLE_SYSTRAY_UNITY_BACKEND
delete unityIndicator; case SystrayBackendType::Unity:
delete unityMenu; delete unityIndicator;
delete unityMenu;
break;
#endif #endif
#ifdef ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND #ifdef ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND
delete statusNotifier; case SystrayBackendType::StatusNotifier:
delete snMenu; delete statusNotifier;
delete snMenu;
break;
#endif #endif
#ifdef ENABLE_SYSTRAY_GTK_BACKEND #ifdef ENABLE_SYSTRAY_GTK_BACKEND
delete gtkIcon; case SystrayBackendType::GTK:
delete gtkMenu; delete gtkIcon;
delete gtkMenu;
break;
#endif #endif
default:
qWarning() << "Unknown Systray Backend Type";
}
qDebug() << "Deleting SystemTrayIcon"; qDebug() << "Deleting SystemTrayIcon";
} }