diff options
| author |  Ameer J | 2021-07-08 14:46:31 -0400 |
|---|---|---|
| committer |  GitHub | 2021-07-08 14:46:31 -0400 |
| commit | 5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7 (patch) | |
| tree | bd1e570a3f0594557e28516b0974aa07f67ad616 /src/core/loader/nro.cpp | |
| parent | Out of bound blit (#6531) (diff) | |
| parent | general: Code formatting improvements (diff) | |
| download | yuzu-5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7.tar.gz yuzu-5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7.tar.xz yuzu-5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7.zip | |
Merge pull request #6539 from lat9nq/default-setting
general: Move most settings' defaults and labels into their definition
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 618555202..951ea966e 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -155,8 +155,8 @@ static bool LoadNroImpl(Kernel::KProcess& process, const std::vector<u8>& data) | |||
| 155 | codeset.segments[i].size = PageAlignSize(nro_header.segments[i].size); | 155 | codeset.segments[i].size = PageAlignSize(nro_header.segments[i].size); |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | if (!Settings::values.program_args.empty()) { | 158 | if (!Settings::values.program_args.GetValue().empty()) { |
| 159 | const auto arg_data = Settings::values.program_args; | 159 | const auto arg_data = Settings::values.program_args.GetValue(); |
| 160 | codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE; | 160 | codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE; |
| 161 | NSOArgumentHeader args_header{ | 161 | NSOArgumentHeader args_header{ |
| 162 | NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}}; | 162 | NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}}; |