From 6d1d488831f1992957b6817eaa590114e6db60b5 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:24:14 -0500
Subject: [PATCH] Revert "Use the client.RoomUpdated action instead of binding
 the value of the settings overlay visibility and creating an event from it
 based on its ValueChanged action."

This reverts commit cbfb999c2845074d799d1126296584898d9be52b.
---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 38c2ca7e0c..df61a0ad21 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
+        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
+
         private GridContainer subScreenContainer;
 
         private IBindable<bool> isConnected;
@@ -182,7 +184,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             };
 
             subScreenContainer.Hide();
-            client.RoomUpdated += roomUpdated;
+            settingsOverlayVisibility.BindTo(settingsOverlay.State);
+            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
         }
 
         protected override void LoadComplete()
@@ -263,13 +266,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void roomUpdated()
+        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
         {
             if (client.Room != null)
             {
-                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
                 subScreenContainer.Show();
-                client.RoomUpdated -= roomUpdated;
+                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
+            }
+            else
+            {
+                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
+                    subScreenContainer.Hide();
+                else
+                    subScreenContainer.Show();
             }
         }