From 2c48750ff078e28bd395e43f0e4686c47b13c762 Mon Sep 17 00:00:00 2001 From: Mary Date: Sat, 4 Jul 2020 01:58:01 +0200 Subject: Fix compilation warnings and use new LibHac APIs for executable loading (#1350) * Fix compilation warnings and use new LibHac APIs for executable loading * Migrate NSO loader to the new reader and fix kip loader * Fix CS0162 restore * Remove extra return lines * Address Moose's comment --- Ryujinx.HLE/HOS/ApplicationLoader.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Ryujinx.HLE/HOS/ApplicationLoader.cs') diff --git a/Ryujinx.HLE/HOS/ApplicationLoader.cs b/Ryujinx.HLE/HOS/ApplicationLoader.cs index f6ab5ba9..bc7016bd 100644 --- a/Ryujinx.HLE/HOS/ApplicationLoader.cs +++ b/Ryujinx.HLE/HOS/ApplicationLoader.cs @@ -415,13 +415,13 @@ namespace Ryujinx.HLE.HOS bool isNro = Path.GetExtension(filePath).ToLower() == ".nro"; - IExecutable nro; + IExecutable executable; if (isNro) { FileStream input = new FileStream(filePath, FileMode.Open); NroExecutable obj = new NroExecutable(input); - nro = obj; + executable = obj; // homebrew NRO can actually have some data after the actual NRO if (input.Length > obj.FileSize) @@ -493,7 +493,7 @@ namespace Ryujinx.HLE.HOS } else { - nro = new NsoExecutable(new LocalStorage(filePath, FileAccess.Read)); + executable = new NsoExecutable(new LocalStorage(filePath, FileAccess.Read)); } _contentManager.LoadEntries(_device); @@ -502,7 +502,7 @@ namespace Ryujinx.HLE.HOS TitleId = metaData.Aci0.TitleId; TitleIs64Bit = metaData.Is64Bit; - ProgramLoader.LoadNsos(_device.System.KernelContext, metaData, executables: nro); + ProgramLoader.LoadNsos(_device.System.KernelContext, metaData, executables: executable); } private Npdm GetDefaultNpdm() -- cgit v1.2.3