Merge branch 'master' into key-config-settings

2017-08-16 17:48:00 +09:00 · 2017-08-16 17:48:00 +09:00 · 16372d9b45
parent 7e1fc47b76 1610cfaa28
commit 16372d9b45
1 changed files with 2 additions and 0 deletions
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@ -87,6 +87,8 @@ public ExpandedState State
            get { return state; }
            set
            {
+                expandEvent?.Cancel();
+
                if (state == value) return;

                state = value;