From a84c7e0b066d10c8a3e74eb1703290b356a86ae7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Feb 2020 12:56:33 +0400
Subject: [PATCH] Don't apply entry from dialogs if postponed.

---
 Telegram/SourceFiles/data/data_histories.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index b9bcb750d..aaff7acca 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -297,6 +297,10 @@ void Histories::sendDialogRequests() {
 }
 
 void Histories::dialogEntryApplied(not_null<History*> history) {
+	const auto state = lookup(history);
+	if (state->postponedRequestEntry) {
+		return;
+	}
 	history->dialogEntryApplied();
 	if (const auto callbacks = _dialogRequestsPending.take(history)) {
 		for (const auto &callback : *callbacks) {
@@ -308,11 +312,9 @@ void Histories::dialogEntryApplied(not_null<History*> history) {
 			callback();
 		}
 	}
-	if (const auto state = lookup(history)) {
-		if (state->sentReadTill && state->sentReadDone) {
-			history->setInboxReadTill(base::take(state->sentReadTill));
-			checkEmptyState(history);
-		}
+	if (state && state->sentReadTill && state->sentReadDone) {
+		history->setInboxReadTill(base::take(state->sentReadTill));
+		checkEmptyState(history);
 	}
 }