sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects 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
1 changed files with 7 additions and 1 deletions
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