From 89effca12ea9cb414c8fee8e49042f5f3bb48700 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 23 Nov 2016 06:38:33 -0500
Subject: [PATCH] Remove need for PlaySongSelect ctor to take a db

---
 osu-framework                                 |  2 +-
 .../Tests/TestCasePlaySongSelect.cs           | 49 ++++++++++---------
 osu.Game/OsuGameBase.cs                       |  2 +-
 osu.Game/Screens/Select/PlaySongSelect.cs     |  5 +-
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/osu-framework b/osu-framework
index 09c18c415d..d9bd79c4c1 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 09c18c415d280448c44cb73f2c4e60e0092b974c
+Subproject commit d9bd79c4c15f7e5eb4e69fa7898b7d358e4516e4
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
index 244982ded3..57dbb2d266 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
@@ -1,31 +1,32 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Collections.Generic;
-using osu.Desktop.VisualTests.Platform;
-using osu.Framework.GameModes.Testing;
-using osu.Game.Database;
-using osu.Game.Modes;
-using osu.Game.Screens.Select;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    class TestCasePlaySongSelect : TestCase
-    {
-        private BeatmapDatabase db;
-        private TestStorage storage;
-
-        public override string Name => @"Song Select";
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Desktop.VisualTests.Platform;
+using osu.Framework.GameModes.Testing;
+using osu.Game.Database;
+using osu.Game.Modes;
+using osu.Game.Screens.Select;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    class TestCasePlaySongSelect : TestCase
+    {
+        private BeatmapDatabase db;
+        private TestStorage storage;
+
+        public override string Name => @"Song Select";
         public override string Description => @"with fake data";
 
-        public override void Reset()
-        {
+        public override void Reset()
+        {
             base.Reset();
 
             if (db == null)
             {
                 storage = new TestStorage(@"TestCasePlaySongSelect");
                 db = new BeatmapDatabase(storage);
+                Dependencies.Cache(db, true);
 
                 var sets = new List<BeatmapSetInfo>();
 
@@ -35,7 +36,7 @@ namespace osu.Desktop.VisualTests.Tests
                 db.Import(sets);
             }
 
-            Add(new PlaySongSelect(db));
+            Add(new PlaySongSelect());
         }
 
         private BeatmapSetInfo createTestBeatmapSet(int i)
@@ -89,6 +90,6 @@ namespace osu.Desktop.VisualTests.Tests
                     },
                 }),
             };
-        }
-    }
-}
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 7b05093dde..2f3e5025b7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -45,7 +45,7 @@ namespace osu.Game
             Dependencies.Cache(new BeatmapDatabase(Host.Storage, Host));
             
             //this completely overrides the framework default. will need to change once we make a proper FontStore.
-            Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f });
+            Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f }, true);
 
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 76ecdcb64e..371d014659 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -73,11 +73,8 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        /// <param name="database">Optionally provide a database to use instead of the OsuGame one.</param>
-        public PlaySongSelect(BeatmapDatabase database = null)
+        public PlaySongSelect()
         {
-            this.database = database;
-
             const float carouselWidth = 640;
             const float bottomToolHeight = 50;
             Children = new Drawable[]