diff options
| author | Mary <me@thog.eu> | 2020-07-04 01:58:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-04 01:58:01 +0200 |
| commit | 2c48750ff078e28bd395e43f0e4686c47b13c762 (patch) | |
| tree | f928a703529b067ead750948b089a1e50755c9fb /Ryujinx.HLE/HOS/ApplicationLoader.cs | |
| parent | e13154c83d52d9e1c26c55bc5655a5df641e26a9 (diff) | |
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
Diffstat (limited to 'Ryujinx.HLE/HOS/ApplicationLoader.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/ApplicationLoader.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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() |