1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 16:12:57 +08:00

Merge branch 'master' into fix-concurrent-tests

This commit is contained in:
Dan Balasescu 2017-09-27 13:39:08 +09:00 committed by GitHub
commit b0c5f90645
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Direct
public Header() public Header()
{ {
Tabs.Current.Value = DirectTab.Search; Tabs.Current.Value = DirectTab.NewestMaps;
Tabs.Current.TriggerChange(); Tabs.Current.TriggerChange();
} }
} }

View File

@ -251,7 +251,7 @@ namespace osu.Game.Overlays
if (Header.Tabs.Current.Value == DirectTab.Search && (Filter.Search.Text == string.Empty || currentQuery == string.Empty)) return; if (Header.Tabs.Current.Value == DirectTab.Search && (Filter.Search.Text == string.Empty || currentQuery == string.Empty)) return;
getSetsRequest = new GetBeatmapSetsRequest(currentQuery, getSetsRequest = new GetBeatmapSetsRequest(currentQuery.Value ?? string.Empty,
((FilterControl)Filter).Ruleset.Value, ((FilterControl)Filter).Ruleset.Value,
Filter.DisplayStyleControl.Dropdown.Current.Value, Filter.DisplayStyleControl.Dropdown.Current.Value,
Filter.Tabs.Current.Value); //todo: sort direction (?) Filter.Tabs.Current.Value); //todo: sort direction (?)