From 4b618aeb6c997f146fc0cd04cf5696e4340e2bb7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Mar 2020 14:25:41 +0400
Subject: [PATCH] Fix saving filters.

---
 Telegram/SourceFiles/boxes/filters/manage_filters_box.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/filters/manage_filters_box.cpp b/Telegram/SourceFiles/boxes/filters/manage_filters_box.cpp
index debf79a407..a58aeccd6a 100644
--- a/Telegram/SourceFiles/boxes/filters/manage_filters_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/manage_filters_box.cpp
@@ -476,13 +476,13 @@ void ManageFiltersPrepare::SetupBox(
 			}
 			return localId;
 		};
-		auto result = base::flat_map<FilterId, FilterId>();
+		auto result = base::flat_map<not_null<FilterRowButton*>, FilterId>();
 		for (auto &row : *rows) {
 			const auto id = row.filter.id();
 			if (row.removed) {
 				continue;
 			} else if (!ranges::contains(list, id, &Data::ChatFilter::id)) {
-				result.emplace(row.filter.id(), chooseNextId());
+				result.emplace(row.button, chooseNextId());
 			}
 		}
 		return result;
@@ -506,7 +506,7 @@ void ManageFiltersPrepare::SetupBox(
 				order.push_back(MTP_int(id));
 				continue;
 			}
-			const auto newId = ids.take(id).value_or(id);
+			const auto newId = ids.take(row.button).value_or(id);
 			const auto tl = removed
 				? MTPDialogFilter()
 				: row.filter.tl(newId);