From c3a5194a6c186a445841da1b7c09ca679c9edd03 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Sep 2014 15:50:35 -0700
Subject: [PATCH] fixed os x crash with tray icon disabled, fixed retina photos
 overview indicators

---
 Telegram/SourceFiles/config.h           |  2 ++
 Telegram/SourceFiles/overviewwidget.cpp |  1 +
 Telegram/SourceFiles/pspecific_mac.cpp  | 20 +++++++-------------
 Telegram/SourceFiles/window.cpp         |  4 +++-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 728e5aca02..a5d2495833 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -19,8 +19,10 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 
 static const int32 AppVersion = 6001;
 static const wchar_t *AppVersionStr = L"0.6.1";
+
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
+
 static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}";
 static const wchar_t *AppFile = L"Telegram";
 
diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp
index 0f027993b6..0e6d44ec2f 100644
--- a/Telegram/SourceFiles/overviewwidget.cpp
+++ b/Telegram/SourceFiles/overviewwidget.cpp
@@ -635,6 +635,7 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 						p.drawPixmap(pos, pix, QRect(0, (h - w) / 2, w, w));
 						size = w;
 					}
+					size /= cIntRetinaFactor();
 
 					if (!quality) {
 						uint64 dt = itemAnimations().animate(item, getms());
diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp
index f233192f39..6cdf90b569 100644
--- a/Telegram/SourceFiles/pspecific_mac.cpp
+++ b/Telegram/SourceFiles/pspecific_mac.cpp
@@ -133,19 +133,13 @@ void PsMainWindow::psRefreshTaskbarIcon() {
 }
 
 void PsMainWindow::psUpdateWorkmode() {
-	switch (cWorkMode()) {
-		case dbiwmWindowAndTray:
-		case dbiwmTrayOnly: {
-			setupTrayIcon();
-		} break;
-
-		case dbiwmWindowOnly: {
-			if (trayIcon) {
-				trayIcon->setContextMenu(0);
-				trayIcon->deleteLater();
-			}
-			trayIcon = 0;
-		} break;
+	setupTrayIcon();
+	if (cWorkMode() == dbiwmWindowOnly) {
+		if (trayIcon) {
+			trayIcon->setContextMenu(0);
+			trayIcon->deleteLater();
+		}
+		trayIcon = 0;
 	}
 }
 
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 3fba77e119..268dfec539 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -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
 }