From 633b969017515da564a14036e7ad3eb0cbb5a141 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 21:57:35 +0300
Subject: [PATCH] Apply review suggestions

---
 .../Visual/Online/TestSceneDirectDownloadButton.cs  |  4 ++--
 osu.Game/Overlays/Direct/PanelDownloadButton.cs     | 13 ++++++-------
 .../Settings/Sections/Online/WebSettings.cs         |  3 ++-
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 5b0c2d3c67..f612992bf6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -149,8 +149,8 @@ namespace osu.Game.Tests.Visual.Online
 
             public DownloadState DownloadState => State.Value;
 
-            public TestDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
-                : base(beatmapSet, noVideo)
+            public TestDownloadButton(BeatmapSetInfo beatmapSet)
+                : base(beatmapSet)
             {
             }
         }
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index f09586c571..51f5b2ae4f 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -15,16 +16,13 @@ namespace osu.Game.Overlays.Direct
     {
         protected bool DownloadEnabled => button.Enabled.Value;
 
-        private readonly bool? noVideo;
-
         private readonly ShakeContainer shakeContainer;
         private readonly DownloadButton button;
+        private readonly BindableBool noVideoSetting = new BindableBool();
 
-        public PanelDownloadButton(BeatmapSetInfo beatmapSet, bool? noVideo = null)
+        public PanelDownloadButton(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
         {
-            this.noVideo = noVideo;
-
             InternalChild = shakeContainer = new ShakeContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -53,6 +51,8 @@ namespace osu.Game.Overlays.Direct
                 return;
             }
 
+            noVideoSetting.BindTo(osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo));
+
             button.Action = () =>
             {
                 switch (State.Value)
@@ -67,8 +67,7 @@ namespace osu.Game.Overlays.Direct
                         break;
 
                     default:
-                        var minimiseDownloadSize = noVideo ?? osuConfig.GetBindable<bool>(OsuSetting.PreferNoVideo).Value;
-                        beatmaps.Download(BeatmapSet.Value, minimiseDownloadSize);
+                        beatmaps.Download(BeatmapSet.Value, noVideoSetting.Value);
                         break;
                 }
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index da3176aca8..23513eade8 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Prefer no-video downloads",
+                    LabelText = "Prefer downloads without video",
+                    Keywords = new[] { "no-video" },
                     Bindable = config.GetBindable<bool>(OsuSetting.PreferNoVideo)
                 },
             };
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index d58218b6b5..d7dcca9809 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -212,8 +212,8 @@ namespace osu.Game.Screens.Multi
 
         private class PlaylistDownloadButton : PanelDownloadButton
         {
-            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet, bool? noVideo = null)
-                : base(beatmapSet, noVideo)
+            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet)
+                : base(beatmapSet)
             {
                 Alpha = 0;
             }