h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00
Code Issues Releases Wiki Activity

Add null check for Android ruleset loading

Browse Source
This commit is contained in:
Michael Malloy 2021-08-22 00:26:35 -05:00
parent 37c0550921
commit 9cd0a182f6
No known key found for this signature in database
GPG Key ID: 96FB9C8062A1892B
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,13 @@ namespace osu.Game.Rulesets
// On android in release configuration assemblies are loaded from the apk directly into memory.
// We cannot read assemblies from cwd, so should check loaded assemblies instead.
loadFromAppDomain();
loadFromDisk();
// This null check prevents Android from attempting to load the rulesets from disk.
// RuntimeInfo.StartupDirectory returns null on Android, and returns a path on other platforms.
if (RuntimeInfo.StartupDirectory != null)
{
loadFromDisk();
}
// the event handler contains code for resolving dependency on the game assembly for rulesets located outside the base game directory.
// It needs to be attached to the assembly lookup event before the actual call to loadUserRulesets() else rulesets located out of the base game directory will fail