emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Ava: Fix regressions by rewriting CheckLaunchState (#5728)

Browse source
This commit is contained in:
Ac_K 2023-09-26 07:17:55 +02:00 committed by GitHub
parent 4744bde0e5
commit 7f2fb049f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
View file

@ -265,33 +265,47 @@ namespace Ryujinx.Ava.UI.Windows
private void CheckLaunchState() private void CheckLaunchState()
{ {
if (ShowKeyErrorOnLoad)
{
ShowKeyErrorOnLoad = false;
UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys).Wait();
}
if (OperatingSystem.IsLinux() && LinuxHelper.VmMaxMapCount < LinuxHelper.RecommendedVmMaxMapCount) if (OperatingSystem.IsLinux() && LinuxHelper.VmMaxMapCount < LinuxHelper.RecommendedVmMaxMapCount)
{ {
Logger.Warning?.Print(LogClass.Application, $"The value of vm.max_map_count is lower than {LinuxHelper.RecommendedVmMaxMapCount}. ({LinuxHelper.VmMaxMapCount})"); Logger.Warning?.Print(LogClass.Application, $"The value of vm.max_map_count is lower than {LinuxHelper.RecommendedVmMaxMapCount}. ({LinuxHelper.VmMaxMapCount})");
if (LinuxHelper.PkExecPath is not null) if (LinuxHelper.PkExecPath is not null)
{ {
ShowVmMaxMapCountDialog().Wait(); Dispatcher.UIThread.Post(async () =>
{
if (OperatingSystem.IsLinux())
{
await ShowVmMaxMapCountDialog();
}
});
} }
else else
{ {
ShowVmMaxMapCountWarning().Wait(); Dispatcher.UIThread.Post(async () =>
{
if (OperatingSystem.IsLinux())
{
await ShowVmMaxMapCountWarning();
}
});
} }
} }
if (!ShowKeyErrorOnLoad)
{
if (_deferLoad) if (_deferLoad)
{ {
_deferLoad = false; _deferLoad = false;
ViewModel.LoadApplication(_launchPath, _startFullscreen).Wait(); ViewModel.LoadApplication(_launchPath, _startFullscreen).Wait();
} }
}
else
{
ShowKeyErrorOnLoad = false;
Dispatcher.UIThread.Post(async () => await UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys));
}
if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false)) if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false))
{ {