From 10e8d6e979ff03c48ea24940dcef211e721460e8 Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Wed, 29 Jan 2020 07:53:44 +0300
Subject: [PATCH] Merge fixes

---
 Telegram/Resources/qrc/telegram/telegram.qrc |  2 +-
 Telegram/SourceFiles/data/data_peer.cpp      |  7 +++----
 lib/xdg/tg.protocol                          | 11 -----------
 3 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 lib/xdg/tg.protocol

diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc
index 34dae207e..ec7bbf2a4 100644
--- a/Telegram/Resources/qrc/telegram/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram/telegram.qrc
@@ -57,9 +57,9 @@
   <qresource prefix="/misc">
     <file alias="default_shortcuts-custom.json">../../default_shortcuts-custom.json</file>
     <file alias="default_kotato-settings-custom.json">../../default_kotato-settings-custom.json</file>
+    <file alias="kotatogramdesktop.desktop">../../../../lib/xdg/kotatogramdesktop.desktop</file>
   </qresource>
   <qresource prefix="/ktg_lang">
     <file alias="ru.json">../../langs/rewrites/ru.json</file>
-    <file alias="kotatogramdesktop.desktop">../../../../lib/xdg/kotatogramdesktop.desktop</file>
   </qresource>
 </RCC>
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index c2d56aeef..8ccfa500b 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -86,12 +86,11 @@ void PeerClickHandler::onClick(ClickContext context) const {
 	if (context.button == Qt::LeftButton && App::wnd()) {
 		const auto controller = App::wnd()->sessionController();
 		const auto currentPeer = controller->activeChatCurrent().peer();
-		if (_peer
-			&& _peer->isChannel()
-			&& currentPeer != _peer) {
+		if (_peer && _peer->isChannel() && currentPeer != _peer) {
 			const auto clickedChannel = _peer->asChannel();
 			if (!clickedChannel->isPublic() && !clickedChannel->amIn()
-				&& currentPeer->asChannel()->linkedChat() != clickedChannel) {
+				&& (!currentPeer->isChannel()
+					|| currentPeer->asChannel()->linkedChat() != clickedChannel)) {
 				Ui::show(Box<InformBox>(_peer->isMegagroup()
 					? tr::lng_group_not_accessible(tr::now)
 					: tr::lng_channel_not_accessible(tr::now)));
diff --git a/lib/xdg/tg.protocol b/lib/xdg/tg.protocol
deleted file mode 100644
index 89d2dc8a7..000000000
--- a/lib/xdg/tg.protocol
+++ /dev/null
@@ -1,11 +0,0 @@
-[Protocol]
-exec=/usr/bin/kotatogram-desktop -- %u
-protocol=tg
-input=none
-output=none
-helper=true
-listing=false
-reading=false
-writing=false
-makedir=false
-deleting=false