From f980f413244c3252890868df1f32c2f1c88d3f81 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 21:38:15 +0100
Subject: [PATCH] Address review

---
 osu.Game.Tournament/IO/TournamentStorage.cs |  6 ++----
 osu.Game.Tournament/Screens/SetupScreen.cs  | 12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 66e27ddbb5..cf54c1f5ef 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -34,18 +34,16 @@ namespace osu.Game.Tournament.IO
             else
                 Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
-            CurrentTournament = new Bindable<string>(storageConfig.Get<string>(StorageConfig.CurrentTournament));
+            CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
 
-            CurrentTournament.BindValueChanged(updateTournament, false);
+            CurrentTournament.BindValueChanged(updateTournament);
         }
 
         private void updateTournament(ValueChangedEvent<string> newTournament)
         {
             ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
             Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
-            storageConfig.Set(StorageConfig.CurrentTournament, newTournament.NewValue);
-            storageConfig.Save();
         }
 
         public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index f22cd13cea..3c9d3c949b 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,16 +42,14 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
         private Bindable<Size> windowSize;
+        private TournamentStorage storage;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, Storage storage)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
 
@@ -66,6 +64,7 @@ namespace osu.Game.Tournament.Screens
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));
             stableInfo.OnStableInfoSaved += () => Schedule(reload);
+            this.storage = (TournamentStorage)storage;
             reload();
         }
 
@@ -75,7 +74,6 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            var tourneyStorage = storage as TournamentStorage;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -121,8 +119,8 @@ namespace osu.Game.Tournament.Screens
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
-                    Items = tourneyStorage?.ListTournaments(),
-                    Current = tourneyStorage?.CurrentTournament,
+                    Items = storage.ListTournaments(),
+                    Current = storage.CurrentTournament,
                 },
                 resolution = new ResolutionSelector
                 {