mirror of
https://github.com/ppy/osu
synced 2024-12-22 23:05:02 +00:00
Fix a couple of remaining issues
This commit is contained in:
parent
3585c3f1d5
commit
58e6b3782b
@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
|
||||
public void TestBasicDisplay()
|
||||
{
|
||||
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));
|
||||
AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
|
||||
}
|
||||
|
@ -7,6 +7,7 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using osu.Framework;
|
||||
using osu.Framework.Extensions.ObjectExtensions;
|
||||
using osu.Framework.Logging;
|
||||
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,
|
||||
// as the underlying path "AppContext.BaseDirectory", despite being non-nullable, it returns null on android.
|
||||
// See https://github.com/xamarin/xamarin-android/issues/3489.
|
||||
if (RuntimeInfo.StartupDirectory != null)
|
||||
if (RuntimeInfo.StartupDirectory.IsNotNull())
|
||||
loadFromDisk();
|
||||
|
||||
// the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory.
|
||||
|
Loading…
Reference in New Issue
Block a user