From 3189a8ebfe0d291f99c88d4defd8d2ba531f36af Mon Sep 17 00:00:00 2001
From: ilya-fedin <fedin-ilja2010@ya.ru>
Date: Sun, 24 May 2020 20:21:52 +0400
Subject: [PATCH] Fix custom icon with XEmbed tray (#51)

---
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 5280d8a31..93e88af95 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -154,6 +154,8 @@ QIcon TrayIconGen(int counter, bool muted) {
 	const auto iconName = GetTrayIconName(counter, muted);
 
 	if (cDisableTrayCounter()
+		&& !QFileInfo::exists(cWorkingDir() + "tdata/icon.png")
+		&& cCustomAppIcon() == 0
 		&& !iconName.isEmpty()) {
 		const auto result = QIcon::fromTheme(iconName);
 		UpdateIconRegenerationNeeded(result, counter, muted, iconThemeName);