From 7f89d9117d98f593209bc90271dd099a2febbcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:04:12 +0100
Subject: [PATCH] Make disposal of tracker idempotent for operations

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index b834d4fa25..5d171e6e43 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -52,5 +52,13 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress?.Return();
             leasedInProgress = null;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            // base call does an UnbindAllBindables().
+            // clean up the leased reference here so that it doesn't get returned twice.
+            leasedInProgress = null;
+        }
     }
 }