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

Fix assertion violation in marking history as read.

Browse Source
This commit is contained in:
John Preston
2019-05-01 16:43:16 +04:00
parent d9ad3a4bbe
commit 4e8c57a861
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/apiwrap.cpp
View File

@@ -6001,6 +6001,11 @@ void ApiWrap::sendReadRequest(not_null<PeerData*> peer, MsgId upTo) {
_readRequests.remove(peer); _readRequests.remove(peer);
if (const auto next = _readRequestsPending.take(peer)) { if (const auto next = _readRequestsPending.take(peer)) {
sendReadRequest(peer, *next); sendReadRequest(peer, *next);
} else if (const auto history
= _session->data().historyLoaded(peer)) {
if (!history->unreadCountKnown()) {
requestDialogEntry(history);
}
} }
}; };
if (const auto channel = peer->asChannel()) { if (const auto channel = peer->asChannel()) {

8
Telegram/SourceFiles/history/history.cpp
View File

@@ -1553,7 +1553,9 @@ void History::readClientSideMessages() {
MsgId History::readInbox() { MsgId History::readInbox() {
const auto upTo = msgIdForRead(); const auto upTo = msgIdForRead();
setUnreadCount(0); if (unreadCountKnown()) {
setUnreadCount(0);
}
readClientSideMessages(); readClientSideMessages();
if (upTo) { if (upTo) {
inboxRead(upTo); inboxRead(upTo);
@@ -3022,7 +3024,9 @@ void History::clear(ClearType type) {
} else { } else {
_notifications.clear(); _notifications.clear();
owner().notifyHistoryCleared(this); owner().notifyHistoryCleared(this);
setUnreadCount(0); if (unreadCountKnown()) {
setUnreadCount(0);
}
if (type == ClearType::DeleteChat) { if (type == ClearType::DeleteChat) {
setLastMessage(nullptr); setLastMessage(nullptr);
} else if (_lastMessage && *_lastMessage) { } else if (_lastMessage && *_lastMessage) {