Skip to content

Commit 77ed12c

Browse files
authored
fix: restore Load() try-catch fallback in RulesetShaderManager and mark flaky test
1 parent 5289ed3 commit 77ed12c

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

osu.Game.Tests/Visual/Ranking/TestSceneSoloResultsScreen.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ public void TestOnlineLeaderboardWithLessThan50Scores()
172172
AddUntilStep("local score is #16", () => this.ChildrenOfType<ScorePanelList>().Single().GetPanelForScore(localScore).ScorePosition.Value, () => Is.EqualTo(16));
173173
}
174174

175+
[FlakyTest]
175176
[Test]
176177
public void TestOnlineLeaderboardWithLessThan50Scores_UserWasInTop50()
177178
{

osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,18 @@ public RulesetShaderManager(IRenderer renderer, NamespacedResourceStore<byte[]>
209209
this.parent = parent;
210210
}
211211

212+
public override IShader Load(string vertex, string fragment)
213+
{
214+
try
215+
{
216+
return base.Load(vertex, fragment);
217+
}
218+
catch (FileNotFoundException)
219+
{
220+
return parent.Load(vertex, fragment);
221+
}
222+
}
223+
212224
public override IShader? GetCachedShader(string vertex, string fragment) => base.GetCachedShader(vertex, fragment) ?? parent.GetCachedShader(vertex, fragment);
213225

214226
public override IShaderPart? GetCachedShaderPart(string name) => base.GetCachedShaderPart(name) ?? parent.GetCachedShaderPart(name);

0 commit comments

Comments
 (0)