From f3d461e3183d5c083d4f02d7592f1b3c04c78ab0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Nov 2016 12:27:43 +0900
Subject: [PATCH] Fix some events not firing correctly.

---
 osu.Game/GameModes/Menu/ButtonSystem.cs | 2 +-
 osu.Game/Overlays/Toolbar.cs            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs
index 25371cb506..10ccf864e6 100644
--- a/osu.Game/GameModes/Menu/ButtonSystem.cs
+++ b/osu.Game/GameModes/Menu/ButtonSystem.cs
@@ -84,7 +84,7 @@ namespace osu.Game.GameModes.Menu
                             Spacing = new Vector2(-wedge_width, 0),
                             Children = new[]
                             {
-                                settingsButton = new Button(@"settings", @"options", FontAwesome.gear, new Color4(85, 85, 85, 255), OnSettings, -wedge_width, Key.O),
+                                settingsButton = new Button(@"settings", @"options", FontAwesome.gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -wedge_width, Key.O),
                                 backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape),
                                 iconFacade = new Container //need a container to make the osu! icon flow properly.
 								{
diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar.cs
index b6fde4d59d..d6ac57a94c 100644
--- a/osu.Game/Overlays/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar.cs
@@ -61,14 +61,14 @@ namespace osu.Game.Overlays
                             Icon = FontAwesome.gear,
                             TooltipMain = "Settings",
                             TooltipSub = "Change your settings",
-                            Action = OnSettings
+                            Action = () => OnSettings?.Invoke()
                         },
                         new ToolbarButton
                         {
                             Icon = FontAwesome.home,
                             TooltipMain = "Home",
                             TooltipSub = "Return to the main menu",
-                            Action = OnHome
+                            Action = () => OnHome?.Invoke()
                         },
                         modeSelector = new ToolbarModeSelector
                         {