mirror of https://github.com/ppy/osu
Add fallback hash generation to fix android startup crash
This commit is contained in:
parent
ea156d47e3
commit
f812767c95
|
@ -36,6 +36,7 @@
|
||||||
using osu.Game.Scoring;
|
using osu.Game.Scoring;
|
||||||
using osu.Game.Skinning;
|
using osu.Game.Skinning;
|
||||||
using osuTK.Input;
|
using osuTK.Input;
|
||||||
|
using RuntimeInfo = osu.Framework.RuntimeInfo;
|
||||||
|
|
||||||
namespace osu.Game
|
namespace osu.Game
|
||||||
{
|
{
|
||||||
|
@ -133,9 +134,18 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load()
|
private void load()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location))
|
using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location))
|
||||||
VersionHash = str.ComputeMD5Hash();
|
VersionHash = str.ComputeMD5Hash();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// special case for android builds, which can't read DLLs from a packed apk.
|
||||||
|
// should eventually be handled in a better way.
|
||||||
|
VersionHash = $"{Version}-{RuntimeInfo.OS}".ComputeMD5Hash();
|
||||||
|
}
|
||||||
|
|
||||||
Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
|
Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue