procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2015-01-28 18:07:47 +03:00
parent 4d357fafb2 0f6429ecb5
commit e1f995ab90
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/pspecific_mac.cpp
View File

@ -108,7 +108,6 @@ void PsMainWindow::psSetupTrayIcon() {
psUpdateCounter(); psUpdateCounter();
trayIcon->show(); trayIcon->show();
psUpdateDelegate();
} }
void PsMainWindow::psUpdateWorkmode() { void PsMainWindow::psUpdateWorkmode() {
@ -116,10 +115,11 @@ void PsMainWindow::psUpdateWorkmode() {
if (cWorkMode() == dbiwmWindowOnly) { if (cWorkMode() == dbiwmWindowOnly) {
if (trayIcon) { if (trayIcon) {
trayIcon->setContextMenu(0); trayIcon->setContextMenu(0);
trayIcon->deleteLater(); delete trayIcon;
} }
trayIcon = 0; trayIcon = 0;
} }
psUpdateDelegate();
setWindowIcon(wndIcon); setWindowIcon(wndIcon);
} }