diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-04-19 11:17:47 -0400 | 
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-04-19 11:17:47 -0400 | 
| commit | a223006c50aa3fa2370b40a1eacd3d6046c5d361 (patch) | |
| tree | 756b7e68303ab25349ec3451e5faf265c1613711 /src/core | |
| parent | 9e7713c150d4d0596ef60ec005fecb4544314c1f (diff) | |
time: Fix GetClockSnapshotFromSystemClockContext
This removes an incorrect alignment usage and corrects the positions of the popped parameters.
- Fixes Super Kirby Clash crashing on boot
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/time/time.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index 63e0247de..8427555e9 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -303,7 +303,7 @@ void Module::Interface::GetClockSnapshotFromSystemClockContext(Kernel::HLEReques      IPC::RequestParser rp{ctx};      const auto type{rp.PopEnum<Clock::TimeType>()}; -    rp.AlignWithPadding(); +    rp.Skip(1, false);      const Clock::SystemClockContext user_context{rp.PopRaw<Clock::SystemClockContext>()};      const Clock::SystemClockContext network_context{rp.PopRaw<Clock::SystemClockContext>()}; @@ -319,9 +319,10 @@ void Module::Interface::GetClockSnapshotFromSystemClockContext(Kernel::HLEReques          return;      } +    ctx.WriteBuffer(clock_snapshot); +      IPC::ResponseBuilder rb{ctx, 2};      rb.Push(RESULT_SUCCESS); -    ctx.WriteBuffer(clock_snapshot);  }  void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser(  | 
