manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-13 19:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch Profile.json parse to prevent crash on launch

Browse source
This commit is contained in:
PhiZero 2022-06-12 05:45:26 +02:00
parent 70895bdb04
commit 90d249450b
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
View file

@ -1,5 +1,7 @@
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Utilities; using Ryujinx.Common.Utilities;
using Ryujinx.Common.Logging;
using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -42,6 +44,8 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
// TODO: Use 0x8000000000000010 system savedata instead of a JSON file if needed. // TODO: Use 0x8000000000000010 system savedata instead of a JSON file if needed.
if (File.Exists(_profilesJsonPath)) if (File.Exists(_profilesJsonPath))
{
try
{ {
ProfilesJson profilesJson = JsonHelper.DeserializeFromFile<ProfilesJson>(_profilesJsonPath); ProfilesJson profilesJson = JsonHelper.DeserializeFromFile<ProfilesJson>(_profilesJsonPath);
@ -54,6 +58,12 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
LastOpened = new UserId(profilesJson.LastOpened); LastOpened = new UserId(profilesJson.LastOpened);
} }
catch (Exception e)
{
Logger.Error?.Print(LogClass.Application, $"Failed to parse {_profilesJsonPath}: {e.Message} Loading default profile!");
LastOpened = AccountManager.DefaultUserId;
}
}
else else
{ {
LastOpened = AccountManager.DefaultUserId; LastOpened = AccountManager.DefaultUserId;