From 0fc98958a3efdc30e2d6ece5a2654df0987ce7ac Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Thu, 4 Jul 2019 10:19:25 -0400
Subject: [PATCH] NVServices: Correct delayed responses.

---
 src/core/hle/service/nvdrv/interface.cpp | 43 +++++++++++-------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp
index b8877b6cb8..d5be64ed28 100644
--- a/src/core/hle/service/nvdrv/interface.cpp
+++ b/src/core/hle/service/nvdrv/interface.cpp
@@ -46,32 +46,27 @@ void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) {
 
     u32 result = nvdrv->Ioctl(fd, command, ctx.ReadBuffer(), output, ctrl);
 
-    if (!ctrl.must_delay) {
-        IPC::ResponseBuilder rb{ctx, 3};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push(result);
-
+    if (ctrl.must_delay) {
+        ctrl.fresh_call = false;
+        ctx.SleepClientThread(
+            "NVServices::DelayedResponse", ctrl.timeout,
+            [=](Kernel::SharedPtr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx,
+                Kernel::ThreadWakeupReason reason) {
+                IoctlCtrl ctrl2{ctrl};
+                std::vector<u8> output2 = output;
+                u32 result = nvdrv->Ioctl(fd, command, ctx.ReadBuffer(), output2, ctrl2);
+                ctx.WriteBuffer(output2);
+                IPC::ResponseBuilder rb{ctx, 3};
+                rb.Push(RESULT_SUCCESS);
+                rb.Push(result);
+            },
+            nvdrv->GetEventWriteable(ctrl.event_id));
+    } else {
         ctx.WriteBuffer(output);
-        return;
     }
-    ctrl.fresh_call = false;
-    ctx.SleepClientThread(
-        "NVServices::DelayedResponse", ctrl.timeout,
-        [this, ctrl = ctrl](Kernel::SharedPtr<Kernel::Thread> thread,
-                            Kernel::HLERequestContext& ctx, Kernel::ThreadWakeupReason reason) {
-            IPC::RequestParser rp{ctx};
-            u32 fd = rp.Pop<u32>();
-            u32 command = rp.Pop<u32>();
-            std::vector<u8> output(ctx.GetWriteBufferSize());
-            IoctlCtrl ctrl2{ctrl};
-            u32 result = nvdrv->Ioctl(fd, command, ctx.ReadBuffer(), output, ctrl2);
-            IPC::ResponseBuilder rb{ctx, 3};
-            rb.Push(RESULT_SUCCESS);
-            rb.Push(result);
-
-            ctx.WriteBuffer(output);
-        },
-        nvdrv->GetEventWriteable(ctrl.event_id));
+    IPC::ResponseBuilder rb{ctx, 3};
+    rb.Push(RESULT_SUCCESS);
+    rb.Push(result);
 }
 
 void NVDRV::Close(Kernel::HLERequestContext& ctx) {