From 94d664a626c5e368d1e00b67e676f2dcf854cafd Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Wed, 16 Aug 2017 17:00:30 +0200
Subject: [PATCH 1/4] Swap the order of the social and chat toolbar buttons

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 1ecfe90aa1..aca1051c7c 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -60,8 +60,8 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new ToolbarSocialButton(),
                         new ToolbarChatButton(),
+                        new ToolbarSocialButton(),
                         new ToolbarMusicButton(),
                         new ToolbarButton
                         {

From 61182092004e43ac597ef1492e29a7bc0acaf63a Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Thu, 17 Aug 2017 18:46:16 +0200
Subject: [PATCH 2/4] Fix unlit initial state of the OnScreenDisplay

---
 osu.Game/Overlays/OnScreenDisplay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs
index 746b6dd50f..dcab942522 100644
--- a/osu.Game/Overlays/OnScreenDisplay.cs
+++ b/osu.Game/Overlays/OnScreenDisplay.cs
@@ -258,7 +258,10 @@ namespace osu.Game.Overlays
                     Type = EdgeEffectType.Glow,
                     Radius = 8,
                 };
+            }
 
+            protected override void LoadComplete()
+            {
                 updateGlow();
                 FinishTransforms(true);
             }

From cc39aad7f8d05fc8f678d1763b998cb1abcab41c Mon Sep 17 00:00:00 2001
From: PoULkY <sky.crash@yahoo.com>
Date: Fri, 18 Aug 2017 01:23:44 +0700
Subject: [PATCH 3/4] Fix OsuButton doesn't implement IFilterable

---
 osu.Game/Graphics/UserInterface/OsuButton.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 3c454f2af2..5650fc6f48 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -7,6 +7,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
@@ -16,7 +17,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuButton : Button
+    public class OsuButton : Button, IFilterable
     {
         private Box hover;
 
@@ -108,5 +109,15 @@ namespace osu.Game.Graphics.UserInterface
             Content.ScaleTo(1, 1000, Easing.OutElastic);
             return base.OnMouseUp(state, args);
         }
+
+        public string[] FilterTerms => new[] { Text };
+
+        public bool MatchingFilter
+        {
+            set
+            {
+                this.FadeTo(value ? 1 : 0);
+            }
+        }
     }
 }
\ No newline at end of file

From e4b832e8a6be6ba801cec5d8e2d6228e86e7f9ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2017 10:48:35 +0900
Subject: [PATCH 4/4] Fix a possible nullref when login fails

---
 osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 3f8b6186c4..7ae45159d9 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     break;
             }
 
-            if (form != null) GetContainingInputManager().ChangeFocus(form);
+            if (form != null) GetContainingInputManager()?.ChangeFocus(form);
         }
 
         public override bool AcceptsFocus => true;