RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-09 07:39:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of remaining issues

Browse Source
This commit is contained in:
Dean Herbert 2023-06-24 09:48:16 +09:00
parent 3585c3f1d5
commit 58e6b3782b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
public void TestBasicDisplay() public void TestBasicDisplay()
{ {
AddStep("Add playing user", () => spectatorClient.SendStartPlay(streamingUser.Id, 0)); AddStep("Add playing user", () => spectatorClient.SendStartPlay(streamingUser.Id, 0));
AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2); AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
AddStep("Remove playing user", () => spectatorClient.SendEndPlay(streamingUser.Id)); AddStep("Remove playing user", () => spectatorClient.SendEndPlay(streamingUser.Id));
AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any()); AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
} }

3
osu.Game/Rulesets/RulesetStore.cs
View File

@ -7,6 +7,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using osu.Framework; using osu.Framework;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
@ -32,7 +33,7 @@ namespace osu.Game.Rulesets
// This null check prevents Android from attempting to load the rulesets from disk, // This null check prevents Android from attempting to load the rulesets from disk,
// as the underlying path "AppContext.BaseDirectory", despite being non-nullable, it returns null on android. // as the underlying path "AppContext.BaseDirectory", despite being non-nullable, it returns null on android.
// See https://github.com/xamarin/xamarin-android/issues/3489. // See https://github.com/xamarin/xamarin-android/issues/3489.
if (RuntimeInfo.StartupDirectory != null) if (RuntimeInfo.StartupDirectory.IsNotNull())
loadFromDisk(); loadFromDisk();
// the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory. // the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory.