Merge branch 'master' into fix-bindable-list-fucked

ppy · Jul 31, 2023 · c28aac1 · c28aac1
2 parents 803861c + eb6a632
commit c28aac1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/osu.Framework/Graphics/Audio/DrawableAudioWrapper.cs b/osu.Framework/Graphics/Audio/DrawableAudioWrapper.cs
@@ -138,11 +138,16 @@ protected virtual void OnMixerChanged(ValueChangedEvent<IAudioMixer> mixer)
         {
         }
 
-        protected override void Dispose(bool isDisposing)
+        internal override void UnbindAllBindables()
         {
-            base.Dispose(isDisposing);
+            base.UnbindAllBindables();
+
             component?.UnbindAdjustments(adjustments);
+        }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
             if (disposeUnderlyingComponentOnDispose)
                 (component as IDisposable)?.Dispose();