From d4db0e0ec5222b175424c49941bba223ec8a9253 Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Mon, 7 Sep 2020 14:59:07 +0300
Subject: [PATCH] Fix closing settings menu on folder refresh

---
 .../window/window_session_controller.cpp            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index d0b849ddc..aefc354a1 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -286,11 +286,20 @@ void SessionController::reloadFiltersMenu() {
 		) | rpl::start_with_next([=] {
 			toggleFiltersMenu(true);
 			if (previousFilter) {
-				setActiveChatsFilter(previousFilter);
+				if (activeChatsFilterCurrent() != previousFilter) {
+					resetFakeUnreadWhileOpened();
+				}
+				_activeChatsFilter.force_assign(previousFilter);
+				if (previousFilter) {
+					closeFolder(true);
+				}
 			}
 		}, lifetime());
 
-		setActiveChatsFilter(0);
+		if (activeChatsFilterCurrent() != 0) {
+			resetFakeUnreadWhileOpened();
+		}
+		_activeChatsFilter.force_assign(0);
 		toggleFiltersMenu(false);
 	}
 }