From 228a48c8bf30f611fab6e2e7a22e7948276b76cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Aug 2022 16:21:52 +0300
Subject: [PATCH] Fix possible crash in main window destructor.

In platform window destructor it can send window state change signal.
---
 Telegram/SourceFiles/window/window_controller.cpp | 4 ++--
 Telegram/SourceFiles/window/window_controller.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index bb33ba6567..124ce16bcc 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -53,9 +53,9 @@ Controller::Controller(
 
 Controller::Controller(CreateArgs &&args)
 : _singlePeer(args.singlePeer)
+, _isActiveTimer([=] { updateIsActive(); })
 , _widget(this)
-, _adaptive(std::make_unique<Adaptive>())
-, _isActiveTimer([=] { updateIsActive(); }) {
+, _adaptive(std::make_unique<Adaptive>()) {
 	_widget.init();
 }
 
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index 578540b59f..53713b2daa 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -138,10 +138,10 @@ private:
 
 	PeerData *_singlePeer = nullptr;
 	Main::Account *_account = nullptr;
+	base::Timer _isActiveTimer;
 	::MainWindow _widget;
 	const std::unique_ptr<Adaptive> _adaptive;
 	std::unique_ptr<SessionController> _sessionController;
-	base::Timer _isActiveTimer;
 	QPointer<Ui::BoxContent> _termsBox;
 
 	rpl::event_stream<Media::View::OpenRequest> _openInMediaViewRequests;