Moved null title id check to LoadAndSaveMetadata

This commit is contained in:
Shyanne 2025-12-29 12:09:44 -05:00
parent 18501d01f3
commit 34190c9184
2 changed files with 10 additions and 11 deletions

View file

@ -640,16 +640,8 @@ namespace Ryujinx.Ava.Systems
{
if (Device.Processes != null)
{
// If the ActiveApplication is null, then the ProgramIdText is invalid.
if (Device.Processes.ActiveApplication is not null)
{
MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText,
_playTimer.Elapsed);
}
else
{
Logger.Error?.PrintMsg(LogClass.Application, "Cannot save metadata because title ID is invalid.");
}
MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication?.ProgramIdText,
_playTimer.Elapsed);
}
ConfigurationState.Instance.System.IgnoreMissingServices.Event -= UpdateIgnoreMissingServicesState;

View file

@ -1159,8 +1159,15 @@ namespace Ryujinx.Ava.Systems.AppLibrary
ApplicationCountUpdated?.Invoke(null, e);
}
public static ApplicationMetadata LoadAndSaveMetaData(string titleId, Action<ApplicationMetadata> modifyFunction = null)
public static ApplicationMetadata? LoadAndSaveMetaData(string titleId, Action<ApplicationMetadata> modifyFunction = null)
{
if (titleId is null)
{
Logger.Warning?.PrintMsg(LogClass.Application, "Cannot save metadata because title ID is invalid.");
return null;
}
string metadataFolder = Path.Combine(AppDataManager.GamesDirPath, titleId, "gui");
string metadataFile = Path.Combine(metadataFolder, "metadata.json");