Fix homebrew loading. Fixes #109, #107

This commit is contained in:
Evan Husted 2024-11-01 06:41:02 -05:00
parent bdb92224f9
commit d7e17abade

View file

@ -12,18 +12,11 @@ namespace Ryujinx.UI.Common.Helper
{
public static bool IsFirmwareValid(ContentManager contentManager, out UserError error)
{
bool hasFirmware = contentManager.GetCurrentFirmwareVersion() != null;
error = contentManager.GetCurrentFirmwareVersion() != null
? UserError.Success
: UserError.NoFirmware;
if (hasFirmware)
{
error = UserError.Success;
return true;
}
error = UserError.NoFirmware;
return false;
return error is UserError.Success;
}
public static bool CanFixStartApplication(ContentManager contentManager, string baseApplicationPath, UserError error, out SystemVersion firmwareVersion)
@ -95,14 +88,18 @@ namespace Ryujinx.UI.Common.Helper
string baseApplicationExtension = Path.GetExtension(baseApplicationPath).ToLowerInvariant();
// NOTE: We don't force homebrew developers to install a system firmware.
if (baseApplicationExtension is not (".nro" or ".nso"))
return IsFirmwareValid(contentManager, out error);
if (baseApplicationExtension is ".nro" or ".nso")
{
error = UserError.Success;
return true;
}
return IsFirmwareValid(contentManager, out error);
}
error = UserError.ApplicationNotFound;
return error is UserError.Success;
return false;
}
}
}