diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp index e0692de4d..77923c5c6 100644 --- a/src/core/hle/service/ac/ac.cpp +++ b/src/core/hle/service/ac/ac.cpp @@ -228,12 +228,12 @@ void Module::Interface::ScanAPs(Kernel::HLERequestContext& ctx) { cmd_buf[19] = output_buffer; // address of output buffer // Create context for call to NWM_INF::RecvBeaconBroadcastData - auto context = std::make_shared(Core::System::GetInstance().Kernel(), + auto context = std::make_shared(Core::System::GetInstance().Kernel(), ctx.Session(), thread); context->PopulateFromIncomingCommandBuffer(cmd_buf.data(), current_process); // Retrieve service from service manager - auto nwm_inf = + auto nwm_inf = Core::System::GetInstance().ServiceManager().GetService("nwm::INF"); // Perform delegated task nwm_inf->HandleSyncRequest(*context); diff --git a/src/core/hle/service/nwm/nwm_inf.cpp b/src/core/hle/service/nwm/nwm_inf.cpp index 532a0350c..d174db23b 100644 --- a/src/core/hle/service/nwm/nwm_inf.cpp +++ b/src/core/hle/service/nwm/nwm_inf.cpp @@ -43,11 +43,11 @@ void NWM_INF::RecvBeaconBroadcastData(Kernel::HLERequestContext& ctx) { // Prepare for call to NWM_UDS std::shared_ptr thread = ctx.ClientThread(); auto current_process = thread->owner_process.lock(); - auto context = std::make_shared(Core::System::GetInstance().Kernel(), + auto context = std::make_shared(Core::System::GetInstance().Kernel(), ctx.Session(), thread); context->PopulateFromIncomingCommandBuffer(cmd_buf.data(), current_process); - auto nwm_uds = + auto nwm_uds = Core::System::GetInstance().ServiceManager().GetService("nwm::UDS"); nwm_uds->HandleSyncRequest(*context);