Fix go to original button in Pinned section.

This commit is contained in:
John Preston 2020-10-30 16:27:53 +03:00
parent 9a2fcdde29
commit b7319c00b9
3 changed files with 4 additions and 3 deletions

View file

@ -2203,7 +2203,8 @@ bool Message::displayFastReply() const {
}
bool Message::displayRightActionComments() const {
return data()->repliesAreComments()
return !isPinnedContext()
&& data()->repliesAreComments()
&& media()
&& media()->isDisplayed()
&& !hasBubble();

View file

@ -1423,7 +1423,7 @@ void MainWidget::ui_showPeerHistory(
if (const auto activeChat = _controller->activeChatCurrent()) {
if (const auto peer = activeChat.peer()) {
if (way == Way::Forward && peer->id == peerId) {
way = Way::ClearStack;
way = _mainSection ? Way::Backward : Way::ClearStack;
}
}
}

@ -1 +1 @@
Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0
Subproject commit 54a8c62bf5dea5e381526a4b25aa5482e140b26c