From b47e29b182a8b0ed038fb456bc6b1e5b92e051f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 10 Nov 2021 10:26:37 +0400
Subject: [PATCH] Fix custom chat themes in scheduled messages.

---
 Telegram/SourceFiles/history/history_widget.cpp | 2 --
 Telegram/SourceFiles/mainwidget.cpp             | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2cbbf128c..2f9de3913 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2203,8 +2203,6 @@ void HistoryWidget::showHistory(
 		refreshTopBarActiveChat();
 		updateTopBarSelection();
 		checkMessagesTTL();
-		// Restore default theme.
-		controller()->setChatStyleTheme(controller()->defaultChatTheme());
 		clearFieldText();
 		doneShow();
 	}
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 0becb6283..feeece08c 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1391,6 +1391,7 @@ void MainWidget::ui_showPeerHistory(
 
 	if (noPeer) {
 		_controller->setActiveChatEntry(Dialogs::Key());
+		_controller->setChatStyleTheme(controller()->defaultChatTheme());
 	}
 
 	if (onlyDialogs) {