diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2024-02-09 10:51:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 10:51:03 -0600 |
| commit | 52c8adc7edd1b4a5ab58d3bf17f9b4acc29a833e (patch) | |
| tree | 2ff103c9bc53c3a006ef2534aa98084ccace8c1b /src/core/hle/service/hle_ipc.cpp | |
| parent | 7ec7ff0f303504950e4270e91076a33efd0ceb17 (diff) | |
| parent | fee263c59c2eaf987f750768548f1cc6aa491d3c (diff) | |
Merge pull request #12951 from liamwhite/more-ipc
ipc: additional fixes
Diffstat (limited to 'src/core/hle/service/hle_ipc.cpp')
| -rw-r--r-- | src/core/hle/service/hle_ipc.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp index 50e1ed756..e0367e774 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp @@ -299,8 +299,12 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer() { if (GetManager()->IsDomain()) { current_offset = domain_offset - static_cast<u32>(outgoing_domain_objects.size()); for (auto& object : outgoing_domain_objects) { - GetManager()->AppendDomainHandler(std::move(object)); - cmd_buf[current_offset++] = static_cast<u32_le>(GetManager()->DomainHandlerCount()); + if (object) { + GetManager()->AppendDomainHandler(std::move(object)); + cmd_buf[current_offset++] = static_cast<u32_le>(GetManager()->DomainHandlerCount()); + } else { + cmd_buf[current_offset++] = 0; + } } } |