sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ppy/osu into Private_Messages

Browse Source
This commit is contained in:
miterosan
2018-07-29 23:28:34 +02:00
parent 8c0bcb8e3c 0d8701d0cb
commit b1e9a4fd24
29 changed files with 237 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/OsuGame.cs
View File

@ -574,10 +574,10 @@ namespace osu.Game
// we only want to apply these restrictions when we are inside a screen stack.
// the use case for not applying is in visual/unit tests.
bool applyRestrictions = !currentScreen?.AllowBeatmapRulesetChange ?? false;
bool applyBeatmapRulesetRestrictions = !currentScreen?.AllowBeatmapRulesetChange ?? false;
ruleset.Disabled = applyRestrictions;
Beatmap.Disabled = applyRestrictions;
ruleset.Disabled = applyBeatmapRulesetRestrictions;
Beatmap.Disabled = applyBeatmapRulesetRestrictions;
mainContent.Padding = new MarginPadding { Top = ToolbarOffset };