RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix search in chat / jump to archive.

This commit is contained in:
John Preston 2022-12-22 11:25:24 +04:00
parent 7cf3babcbd
commit 191ea6f0f4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -3703,8 +3703,11 @@ void InnerWidget::setupShortcuts() {
const auto folder = session().data().folderLoaded(
Data::Folder::kId);
if (folder && !folder->chatsList()->empty()) {
_controller->openFolder(folder);
_controller->window().hideSettingsAndLayer();
const auto controller = _controller;
controller->openFolder(folder);
// Calling openFolder() could've destroyed this widget.
controller->window().hideSettingsAndLayer();
return true;
}
return false;

4
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@ -2161,7 +2161,9 @@ bool Widget::setSearchInChat(Key chat, PeerData *from) {
}
_searchInMigrated = nullptr;
if (peer) {
if (const auto migrateTo = peer->migrateTo()) {
if (_layout != Layout::Main) {
return false;
} else if (const auto migrateTo = peer->migrateTo()) {
return setSearchInChat(peer->owner().history(migrateTo), from);
} else if (const auto migrateFrom = peer->migrateFrom()) {
if (!forum) {