From bc10fcafae2d57b6bb07d6bf666ee72577e5b8f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:23:01 +0900
Subject: [PATCH] Remove now unnecessary schedule

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b5eff04532..cb2b6dda95 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private Drawable userModsSection;
 
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
-        private readonly IBindable<PlaylistItem> matchCurrentItem = new Bindable<PlaylistItem>();
 
         [CanBeNull]
         private IDisposable readyClickOperation;
@@ -269,8 +268,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            matchCurrentItem.BindTo(client.CurrentMatchPlayingItem);
-            matchCurrentItem.BindValueChanged(onCurrentItemChanged, true);
+            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
 
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
@@ -286,20 +285,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
-        private void onCurrentItemChanged(ValueChangedEvent<PlaylistItem> item)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
         {
             if (client?.LocalUser == null)
                 return;
 
-            // If we're about to enter gameplay, schedule the item to be set at a later time.
-            if (client.LocalUser.State > MultiplayerUserState.Ready)
-            {
-                Schedule(() => onCurrentItemChanged(item));
-                return;
-            }
-
-            SelectedItem.Value = item.NewValue;
-
             if (item.NewValue?.AllowedMods.Any() != true)
             {
                 userModsSection.Hide();