Scroll to top of the filter on second click.

Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp

@@ -2568,6 +2568,7 @@ void InnerWidget::switchToFilter(FilterId filterId) {
 		filterId = 0;
 	}
 	if (_filterId == filterId) {
+		emit mustScrollTo(0, 0);
 		return;
 	}
 	if (_openedFolder) {

Telegram/SourceFiles/window/window_session_controller.cpp

@@ -781,7 +781,7 @@ FilterId SessionController::activeChatsFilterCurrent() const {
 }
 
 void SessionController::setActiveChatsFilter(FilterId id) {
-	_activeChatsFilter = id;
+	_activeChatsFilter.force_assign(id);
 	if (id) {
 		closeFolder();
 	}