diff --git a/src/Ryujinx.Gtk3/Program.cs b/src/Ryujinx.Gtk3/Program.cs index 8bb651640..1b7cd3cc1 100644 --- a/src/Ryujinx.Gtk3/Program.cs +++ b/src/Ryujinx.Gtk3/Program.cs @@ -331,15 +331,13 @@ namespace Ryujinx { if (mainWindow.ApplicationLibrary.TryGetApplicationsFromFile(CommandLineState.LaunchPathArg, out List applications)) { - ApplicationData applicationData; - 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 { @@ -349,8 +347,7 @@ namespace Ryujinx } else { - applicationData = applications[0]; - mainWindow.RunApplication(applicationData, CommandLineState.StartFullscreenArg); + mainWindow.RunApplication(applications[0], CommandLineState.StartFullscreenArg); } } else diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs index 348412e78..f5e826c17 100644 --- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs +++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs @@ -325,15 +325,13 @@ namespace Ryujinx.Ava.UI.Windows if (ApplicationLibrary.TryGetApplicationsFromFile(_launchPath, out List applications)) { - ApplicationData applicationData; - 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 { @@ -343,8 +341,7 @@ namespace Ryujinx.Ava.UI.Windows } else { - applicationData = applications[0]; - await ViewModel.LoadApplication(applicationData, _startFullscreen); + await ViewModel.LoadApplication(applications[0], _startFullscreen); } } else