Merge pull request #370 from peppy/general-fixes

General fixes.
ppy · Feb 18, 2017 · a536953 · a536953
2 parents b92726c + c119410
commit a536953
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/osu.Game/Overlays/Options/Sidebar.cs b/osu.Game/Overlays/Options/Sidebar.cs
@@ -74,6 +74,7 @@ public SidebarScrollContainer()
             {
                 Content.Anchor = Anchor.CentreLeft;
                 Content.Origin = Anchor.CentreLeft;
+                RelativeSizeAxes = Axes.Both;
             }
         }
     }

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -32,8 +32,6 @@ public partial class ButtonSystem : Container, IStateful<MenuState>
         public Action OnChart;
         public Action OnTest;
 
-        private SampleChannel sampleOsuClick;
-
         private Toolbar toolbar;
 
         private FlowContainerWithOrigin buttonFlow;
@@ -122,7 +120,6 @@ public ButtonSystem()
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, OsuGame game = null)
         {
-            sampleOsuClick = audio.Sample.Get(@"Menu/menuhit");
             toolbar = game?.Toolbar;
         }
 
@@ -181,7 +178,6 @@ private void onOsuLogo()
             switch (state)
             {
                 case MenuState.Initial:
-                    sampleOsuClick.Play();
                     State = MenuState.TopLevel;
                     return;
                 case MenuState.TopLevel: