diff options
| author | wi <william.os4y@gmail.com> | 2015-04-15 21:52:02 +0200 |
|---|---|---|
| committer | wi <william.os4y@gmail.com> | 2015-04-15 21:52:02 +0200 |
| commit | fb397d589e02a59f5c6cfc90cb52769df01412a9 (patch) | |
| tree | 7a0320eff2708591bbac68a3241441eca5f2f9f3 /lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp | |
| parent | Corrections proposed by Ken (diff) | |
| parent | Clean up a *lot* of the general XCB warnings that sometimes occur, and also t... (diff) | |
| download | lumina-fb397d589e02a59f5c6cfc90cb52769df01412a9.tar.gz lumina-fb397d589e02a59f5c6cfc90cb52769df01412a9.tar.bz2 lumina-fb397d589e02a59f5c6cfc90cb52769df01412a9.zip | |
Merge remote-tracking branch 'upstream/master' into deskEditor
Diffstat (limited to 'lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp')
| -rw-r--r-- | lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp b/lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp index e5cc17df..8d0cacb3 100644 --- a/lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp +++ b/lumina-desktop/panel-plugins/systemtray/TrayIcon.cpp @@ -24,9 +24,9 @@ TrayIcon::TrayIcon(QWidget *parent) : QWidget(parent){ } TrayIcon::~TrayIcon(){ - if(AID!=0){ + /*if(AID!=0){ detachApp(); - } + }*/ } WId TrayIcon::appID(){ |