Merge pull request #5956 from peppy/fix-drawable-audio-wrapper-deadlock

Fix `DrawableAudioWrapper` deadlock by moving unbind to `UnbindAllBindables`
ppy · Jul 31, 2023 · eb6a632 · eb6a632
2 parents e40d447 + 96f0666
commit eb6a632
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();