mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-04 16:45:12 +00:00
Code Issues Releases Wiki Activity

Fix possible race conditions in msgid().

Browse Source
This commit is contained in:
John Preston
2019-07-10 19:28:33 +02:00
parent 68b1024dd4
commit c5df4db621
63 changed files with 513 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_chat.h"
#include "passport/passport_form_controller.h"
#include "core/shortcuts.h"
#include "base/unixtime.h"
#include "boxes/calendar_box.h"
#include "mainwidget.h"
#include "mainwindow.h"
@@ -492,13 +493,13 @@ void SessionController::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
}
}
} else if (history->chatListTimeId() != 0) {
return ParseDateTime(history->chatListTimeId()).date();
return base::unixtime::parse(history->chatListTimeId()).date();
}
//} else if (const auto feed = chat.feed()) { // #feed
// if (chatScrollPosition(feed)) { // #TODO feeds save position
// } else if (feed->chatListTimeId() != 0) {
// return ParseDateTime(feed->chatListTimeId()).date();
// return base::unixtime::parse(feed->chatListTimeId()).date();
// }
}
return QDate();
@@ -509,11 +510,11 @@ void SessionController::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
history = channel->owner().historyLoaded(channel);
}
if (history && history->chatListTimeId() != 0) {
return ParseDateTime(history->chatListTimeId()).date();
return base::unixtime::parse(history->chatListTimeId()).date();
}
//} else if (const auto feed = chat.feed()) { // #feed
// if (feed->chatListTimeId() != 0) {
// return ParseDateTime(feed->chatListTimeId()).date();
// return base::unixtime::parse(feed->chatListTimeId()).date();
// }
}
return QDate::currentDate();