Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix check for application id when launching directly from the command line

Browse source
This commit is contained in:
TSR Berry 2024-07-28 21:05:58 +02:00
parent 32b4e9d136
commit 7fca6ad333
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Ryujinx.Gtk3/Program.cs
View file

@ -331,15 +331,13 @@ namespace Ryujinx
{ {
if (mainWindow.ApplicationLibrary.TryGetApplicationsFromFile(CommandLineState.LaunchPathArg, out List<ApplicationData> applications)) if (mainWindow.ApplicationLibrary.TryGetApplicationsFromFile(CommandLineState.LaunchPathArg, out List<ApplicationData> applications))
{ {
ApplicationData applicationData;
if (CommandLineState.LaunchApplicationId != null) if (CommandLineState.LaunchApplicationId != null)
{ {
applicationData = applications.Find(application => application.IdString == CommandLineState.LaunchApplicationId); int applicationIndex = applications.FindIndex(application => application.IdString.Equals(CommandLineState.LaunchApplicationId, StringComparison.InvariantCultureIgnoreCase));
if (applicationData != null) if (applicationIndex != -1)
{ {
mainWindow.RunApplication(applicationData, CommandLineState.StartFullscreenArg); mainWindow.RunApplication(applications[applicationIndex], CommandLineState.StartFullscreenArg);
} }
else else
{ {
@ -349,8 +347,7 @@ namespace Ryujinx
} }
else else
{ {
applicationData = applications[0]; mainWindow.RunApplication(applications[0], CommandLineState.StartFullscreenArg);
mainWindow.RunApplication(applicationData, CommandLineState.StartFullscreenArg);
} }
} }
else else

11
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View file

@ -325,15 +325,13 @@ namespace Ryujinx.Ava.UI.Windows
if (ApplicationLibrary.TryGetApplicationsFromFile(_launchPath, out List<ApplicationData> applications)) if (ApplicationLibrary.TryGetApplicationsFromFile(_launchPath, out List<ApplicationData> applications))
{ {
ApplicationData applicationData;
if (_launchApplicationId != null) if (_launchApplicationId != null)
{ {
applicationData = applications.Find(application => application.IdString == _launchApplicationId); int applicationIndex = applications.FindIndex(application => application.IdString.Equals(_launchApplicationId, StringComparison.InvariantCultureIgnoreCase));
if (applicationData != null) if (applicationIndex != -1)
{ {
await ViewModel.LoadApplication(applicationData, _startFullscreen); await ViewModel.LoadApplication(applications[applicationIndex], _startFullscreen);
} }
else else
{ {
@ -343,8 +341,7 @@ namespace Ryujinx.Ava.UI.Windows
} }
else else
{ {
applicationData = applications[0]; await ViewModel.LoadApplication(applications[0], _startFullscreen);
await ViewModel.LoadApplication(applicationData, _startFullscreen);
} }
} }
else else