From 04e99d1369ca6bf51ae6e982d8ab3e6f1e6ed764 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 12 Jul 2017 13:40:17 +0900 Subject: [PATCH] Only apply disable rules when in a screen stack. --- osu.Game/Screens/OsuScreen.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index f0e673a739..64223db100 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -89,8 +89,13 @@ namespace osu.Game.Screens { if (!IsCurrentScreen) return; - ruleset.Disabled = !AllowBeatmapRulesetChange; - beatmap.Disabled = !AllowBeatmapRulesetChange; + if (ParentScreen != null) + { + // 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. + ruleset.Disabled = !AllowBeatmapRulesetChange; + beatmap.Disabled = !AllowBeatmapRulesetChange; + } } protected override void OnResuming(Screen last)