kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse source
This commit is contained in:
Eric Kotato 2020-05-01 22:04:38 +03:00
commit 451cc00d20
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/history/history.cpp
View file

@ -2589,7 +2589,7 @@ bool History::useTopPromotion() const {
} else if (const auto channel = peer->asChannel()) { } else if (const auto channel = peer->asChannel()) {
return !isPinnedDialog(FilterId()) && !channel->amIn(); return !isPinnedDialog(FilterId()) && !channel->amIn();
} else if (const auto user = peer->asUser()) { } else if (const auto user = peer->asUser()) {
return !isPinnedDialog(FilterId()) && user->isBot(); return !isPinnedDialog(FilterId()) && user->isBot() && isEmpty();
} }
return false; return false;
} }

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 966cf4d23d9fbd6437744f8f90a92970f05513e5 Subproject commit 0ca2b761c6cbc34b07966b6cb97a20eb5d8f35a0