From 3a7b9bf096d1b3c259c8db8c7c44f9c99dc44ff5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 17 Aug 2021 08:56:49 +0300
Subject: [PATCH 1/2] Fix `MatchSettingsOverlay` not resetting focus on hide
 properly

---
 .../Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index 2676453a7e..62a968b508 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -41,11 +41,13 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected override void PopIn()
         {
+            base.PopIn();
             Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
+            base.PopOut();
             Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
         }
 

From 6ee6a468941525b3b6d98369c4f3fdcdd30c58d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Aug 2021 16:22:12 +0900
Subject: [PATCH 2/2] Remove unnecessary `public` prefix in interface
 specification

---
 osu.Game/Screens/Play/ILocalUserPlayInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/ILocalUserPlayInfo.cs b/osu.Game/Screens/Play/ILocalUserPlayInfo.cs
index 64c3f97305..9a2259b12f 100644
--- a/osu.Game/Screens/Play/ILocalUserPlayInfo.cs
+++ b/osu.Game/Screens/Play/ILocalUserPlayInfo.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Whether the local user is currently playing.
         /// </summary>
-        public IBindable<bool> IsPlaying { get; }
+        IBindable<bool> IsPlaying { get; }
     }
 }