diff options
| author | bunnei <bunneidev@gmail.com> | 2021-04-04 06:21:22 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2021-05-06 01:40:50 +0200 |
| commit | 5e5933256b022f6890fc3f14164ae9e9c3ee9ae3 (patch) | |
| tree | f65bdacde0afe5465446f90e26f2da1b8126cda9 /src/core/hle/service/sm | |
| parent | hle: kernel: Migrate more of KThread to KAutoObject. (diff) | |
| download | yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.tar yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.tar.gz yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.tar.bz2 yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.tar.lz yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.tar.xz yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.tar.zst yuzu-5e5933256b022f6890fc3f14164ae9e9c3ee9ae3.zip | |
Diffstat (limited to 'src/core/hle/service/sm')
| -rw-r--r-- | src/core/hle/service/sm/controller.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/sm/sm.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp index 916177efd..b34fe4bc2 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/controller.cpp @@ -30,7 +30,7 @@ void Controller::CloneCurrentObject(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles}; rb.Push(RESULT_SUCCESS); - rb.PushMoveObjects(ctx.Session()->GetParent()->Client()); + rb.PushMoveObjects(ctx.Session()->GetParent()->Client().get()); } void Controller::CloneCurrentObjectEx(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 94608d529..62f7a5358 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -134,7 +134,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) { const auto& server_port = client_port.Unwrap()->GetServerPort(); if (server_port->GetHLEHandler()) { - server_port->GetHLEHandler()->ClientConnected(server); + server_port->GetHLEHandler()->ClientConnected(client, server); } else { server_port->AppendPendingSession(server); } @@ -142,7 +142,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_SM, "called service={} -> session={}", name, client->GetObjectId()); IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles}; rb.Push(RESULT_SUCCESS); - rb.PushMoveObjects(std::move(client)); + rb.PushMoveObjects(client.get()); } void SM::RegisterService(Kernel::HLERequestContext& ctx) { @@ -170,7 +170,9 @@ void SM::RegisterService(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles}; rb.Push(handle.Code()); - rb.PushMoveObjects(std::move(handle).Unwrap()); + + auto server_port = handle.Unwrap(); + rb.PushMoveObjects(server_port.get()); } void SM::UnregisterService(Kernel::HLERequestContext& ctx) { |