From 4e8c57a86137b0d58260ee648ccf9bf3bcf9e50e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2019 16:43:16 +0400
Subject: [PATCH] Fix assertion violation in marking history as read.

---
 Telegram/SourceFiles/apiwrap.cpp         | 5 +++++
 Telegram/SourceFiles/history/history.cpp | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index cf5415732..dfd506a0d 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -6001,6 +6001,11 @@ void ApiWrap::sendReadRequest(not_null<PeerData*> peer, MsgId upTo) {
 			_readRequests.remove(peer);
 			if (const auto next = _readRequestsPending.take(peer)) {
 				sendReadRequest(peer, *next);
+			} else if (const auto history
+				= _session->data().historyLoaded(peer)) {
+				if (!history->unreadCountKnown()) {
+					requestDialogEntry(history);
+				}
 			}
 		};
 		if (const auto channel = peer->asChannel()) {
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 747c23c9e..e5b701f69 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1553,7 +1553,9 @@ void History::readClientSideMessages() {
 
 MsgId History::readInbox() {
 	const auto upTo = msgIdForRead();
-	setUnreadCount(0);
+	if (unreadCountKnown()) {
+		setUnreadCount(0);
+	}
 	readClientSideMessages();
 	if (upTo) {
 		inboxRead(upTo);
@@ -3022,7 +3024,9 @@ void History::clear(ClearType type) {
 	} else {
 		_notifications.clear();
 		owner().notifyHistoryCleared(this);
-		setUnreadCount(0);
+		if (unreadCountKnown()) {
+			setUnreadCount(0);
+		}
 		if (type == ClearType::DeleteChat) {
 			setLastMessage(nullptr);
 		} else if (_lastMessage && *_lastMessage) {