From affad4724867f9cda7a5d707a1edca3943e0c0a0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 29 May 2020 19:44:53 +0300
Subject: [PATCH] Fix genre/language search doesn't work

---
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs | 13 ++++++++++---
 .../BeatmapListing/BeatmapListingFilterControl.cs   |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 0c3272c7de..ce8b40aa30 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -27,7 +27,14 @@ namespace osu.Game.Online.API.Requests
 
         private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, Cursor cursor = null, SearchCategory searchCategory = SearchCategory.Any, SortCriteria sortCriteria = SortCriteria.Ranked, SortDirection sortDirection = SortDirection.Descending)
+        public SearchBeatmapSetsRequest(string query,
+            RulesetInfo ruleset,
+            Cursor cursor = null,
+            SearchCategory searchCategory = SearchCategory.Any,
+            SortCriteria sortCriteria = SortCriteria.Ranked,
+            SortDirection sortDirection = SortDirection.Descending,
+            SearchGenre genre = SearchGenre.Any,
+            SearchLanguage language = SearchLanguage.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -36,8 +43,8 @@ namespace osu.Game.Online.API.Requests
             SearchCategory = searchCategory;
             SortCriteria = sortCriteria;
             SortDirection = sortDirection;
-            Genre = SearchGenre.Any;
-            Language = SearchLanguage.Any;
+            Genre = genre;
+            Language = language;
         }
 
         protected override WebRequest CreateWebRequest()
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 41c99d5d03..0ead5cc226 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -177,7 +177,9 @@ namespace osu.Game.Overlays.BeatmapListing
                 lastResponse?.Cursor,
                 searchControl.Category.Value,
                 sortControl.Current.Value,
-                sortControl.SortDirection.Value);
+                sortControl.SortDirection.Value,
+                searchControl.Genre.Value,
+                searchControl.Language.Value);
 
             getSetsRequest.Success += response =>
             {