From dad5dd36676de0c965c645b2564e496adb334908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:17:37 +0100
Subject: [PATCH] Remove unnecessary permissiveness wrt null

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 3 ++-
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs   | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 39323d9db9..e539b315e4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -241,7 +241,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             void endOperation()
             {
-                readyClickOperation?.Dispose();
+                Debug.Assert(readyClickOperation != null);
+                readyClickOperation.Dispose();
                 readyClickOperation = null;
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 6a340d7954..c34d39136e 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -40,13 +40,12 @@ namespace osu.Game.Screens.OnlinePlay
             return new InvokeOnDisposal(endOperation);
         }
 
-        /// <summary>
-        /// Ends tracking an online operation.
-        /// Does nothing if an operation has not been begun yet.
-        /// </summary>
         private void endOperation()
         {
-            leasedInProgress?.Return();
+            if (leasedInProgress == null)
+                throw new InvalidOperationException("Cannot end operation multiple times.");
+
+            leasedInProgress.Return();
             leasedInProgress = null;
         }
     }