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

kotatogram · May 1, 2020 · 451cc00 · 451cc00
2 parents f6e89fe + 07c8aae
commit 451cc00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
@@ -2589,7 +2589,7 @@ bool History::useTopPromotion() const {
 	} else if (const auto channel = peer->asChannel()) {
 		return !isPinnedDialog(FilterId()) && !channel->amIn();
 	} else if (const auto user = peer->asUser()) {
-		return !isPinnedDialog(FilterId()) && user->isBot();
+		return !isPinnedDialog(FilterId()) && user->isBot() && isEmpty();
 	}
 	return false;
 }

diff --git a/Telegram/lib_ui b/Telegram/lib_ui