From f9ca7f450553c51f9084bc5e733bdb16b1e121fc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 10 Jan 2023 16:23:47 +0400
Subject: [PATCH] Beta version 4.5.4: Fix "Mark-as-read-inactive setting."

---
 Telegram/SourceFiles/history/history_widget.cpp         | 4 ----
 Telegram/SourceFiles/history/history_widget.h           | 2 --
 Telegram/SourceFiles/mainwindow.cpp                     | 6 +++++-
 Telegram/SourceFiles/mainwindow.h                       | 2 ++
 Telegram/SourceFiles/settings/settings_experimental.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 0208dbae3..0e521526f 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -126,7 +126,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/player/media_player_instance.h"
 #include "core/application.h"
 #include "apiwrap.h"
-#include "base/options.h"
 #include "base/qthelp_regex.h"
 #include "ui/boxes/report_box.h"
 #include "ui/chat/pinned_bar.h"
@@ -171,9 +170,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QWindow>
 #include <QtCore/QMimeData>
 
-const char kOptionAutoScrollInactiveChat[] =
-	"auto-scroll-inactive-chat";
-
 namespace {
 
 constexpr auto kMessagesPerPageFirst = 30;
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index e0fd4985b..307679c3d 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -103,8 +103,6 @@ class TTLButton;
 class BotKeyboard;
 class HistoryInner;
 
-extern const char kOptionAutoScrollInactiveChat[];
-
 class HistoryWidget final
 	: public Window::AbstractSectionWidget
 	, private HistoryView::CornerButtonsDelegate {
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index d13cf36ac..af2649392 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_intro.h"
 #include "platform/platform_notifications_manager.h"
 #include "base/platform/base_platform_info.h"
+#include "base/options.h"
 #include "base/variant.h"
 #include "window/notifications_manager.h"
 #include "window/themes/window_theme.h"
@@ -85,6 +86,9 @@ base::options::toggle AutoScrollInactiveChat({
 
 } // namespace
 
+const char kOptionAutoScrollInactiveChat[] =
+	"auto-scroll-inactive-chat";
+
 MainWindow::MainWindow(not_null<Window::Controller*> controller)
 : Platform::MainWindow(controller) {
 	resize(st::windowDefaultWidth, st::windowDefaultHeight);
@@ -545,7 +549,7 @@ bool MainWindow::markingAsRead() const {
 		&& !_main->isHidden()
 		&& !_main->animatingShow()
 		&& !_layer
-		&& (AutoScrollInactiveChat().value()
+		&& (AutoScrollInactiveChat.value()
 			|| (isActive() && !_main->session().updates().isIdle()));
 }
 
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 66cf9ec1c..ea65329c6 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -42,6 +42,8 @@ class LayerStackWidget;
 
 class MediaPreviewWidget;
 
+extern const char kOptionAutoScrollInactiveChat[];
+
 class MainWindow : public Platform::MainWindow {
 public:
 	explicit MainWindow(not_null<Window::Controller*> controller);
diff --git a/Telegram/SourceFiles/settings/settings_experimental.cpp b/Telegram/SourceFiles/settings/settings_experimental.cpp
index 5a0896923..d9c62f313 100644
--- a/Telegram/SourceFiles/settings/settings_experimental.cpp
+++ b/Telegram/SourceFiles/settings/settings_experimental.cpp
@@ -19,8 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_specific.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "dialogs/dialogs_inner_widget.h"
-#include "history/history_widget.h"
 #include "lang/lang_keys.h"
+#include "mainwindow.h"
 #include "media/player/media_player_instance.h"
 #include "webview/webview_embed.h"
 #include "window/window_peer_menu.h"