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

Fix possible crash in calendar box.

This commit is contained in:
John Preston 2019-05-28 14:33:42 +02:00
parent f0ed5640db
commit b3f5973329
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/window/window_controller.cpp
View File

@ -500,8 +500,8 @@ void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
// return ParseDateTime(feed->chatListTimeId()).date(); // return ParseDateTime(feed->chatListTimeId()).date();
// } // }
} }
return QDate::currentDate(); return QDate();
}; }();
const auto maxPeerDate = [](Dialogs::Key chat) { const auto maxPeerDate = [](Dialogs::Key chat) {
if (auto history = chat.history()) { if (auto history = chat.history()) {
if (const auto channel = history->peer->migrateTo()) { if (const auto channel = history->peer->migrateTo()) {
@ -545,9 +545,11 @@ void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
} }
return startDate(); return startDate();
}; };
const auto highlighted = requestedDate.isNull() const auto highlighted = !requestedDate.isNull()
? currentPeerDate() ? requestedDate
: requestedDate; : !currentPeerDate.isNull()
? currentPeerDate
: QDate::currentDate();
const auto month = highlighted; const auto month = highlighted;
auto callback = [=](const QDate &date) { auto callback = [=](const QDate &date) {
session().api().jumpToDate(chat, date); session().api().jumpToDate(chat, date);