2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00

fixed os x crash with tray icon disabled, fixed retina photos overview indicators

This commit is contained in:
John Preston
2014-09-30 15:50:35 -07:00
parent 9a3ea063c8
commit c3a5194a6c
4 changed files with 13 additions and 14 deletions

View File

@@ -795,7 +795,9 @@ void Window::updateTrayMenu(bool force) {
disconnect(first, SIGNAL(triggered(bool)), 0, 0);
connect(first, SIGNAL(triggered(bool)), this, active ? SLOT(minimizeToTray()) : SLOT(showFromTray()));
#ifndef Q_OS_WIN
trayIcon->setContextMenu((active || cPlatform() != dbipMac) ? trayIconMenu : 0);
if (trayIcon) {
trayIcon->setContextMenu((active || cPlatform() != dbipMac) ? trayIconMenu : 0);
}
#endif
}