From 5ebead2bfd27a6df4c7150625f9d9e0da38b1116 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 21:44:07 +0900
Subject: [PATCH] Prevent ValueChanged binds to external bindable

---
 osu.Game/Screens/Select/FilterControl.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 58c27751fd..d49d0c57e6 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -204,6 +204,7 @@ namespace osu.Game.Screens.Select
         private class CollectionFilterDropdown : OsuDropdown<CollectionFilter>
         {
             private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
+            private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
             private readonly BindableList<CollectionFilter> filters = new BindableList<CollectionFilter>();
 
             public CollectionFilterDropdown()
@@ -223,7 +224,8 @@ namespace osu.Game.Screens.Select
             {
                 base.LoadComplete();
 
-                Current.BindValueChanged(filterChanged);
+                beatmaps.CollectionChanged += filterBeatmapsChanged;
+                Current.BindValueChanged(filterChanged, true);
             }
 
             /// <summary>
@@ -246,10 +248,10 @@ namespace osu.Game.Screens.Select
             private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
             {
                 if (filter.OldValue?.Collection != null)
-                    filter.OldValue.Collection.Beatmaps.CollectionChanged -= filterBeatmapsChanged;
+                    beatmaps.UnbindFrom(filter.OldValue.Collection.Beatmaps);
 
                 if (filter.NewValue?.Collection != null)
-                    filter.NewValue.Collection.Beatmaps.CollectionChanged += filterBeatmapsChanged;
+                    beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
             }
 
             /// <summary>