summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-01-30 04:25:57 +0100
committerbunnei <bunneidev@gmail.com>2020-02-06 05:06:53 +0100
commit3a0c1e79f8266a945df04394f478a3aa598702e5 (patch)
treec52cc318a91a5e34ac44029da0a62ad871120d29
parentservices: am: Clear events on PopOutData and PopInteractiveOutData. (diff)
downloadyuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.tar
yuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.tar.gz
yuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.tar.bz2
yuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.tar.lz
yuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.tar.xz
yuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.tar.zst
yuzu-3a0c1e79f8266a945df04394f478a3aa598702e5.zip
-rw-r--r--src/core/hle/service/am/am.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index d1495ce18..c1550013a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -856,17 +856,16 @@ private:
void PopOutData(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_AM, "called");
- IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-
const auto storage = applet->GetBroker().PopNormalDataToGame();
if (storage == nullptr) {
LOG_ERROR(Service_AM,
"storage is a nullptr. There is no data in the current normal channel");
-
+ IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ERR_NO_DATA_IN_CHANNEL);
return;
}
+ IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS);
rb.PushIpcInterface<IStorage>(std::move(*storage));
}
@@ -888,17 +887,16 @@ private:
void PopInteractiveOutData(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_AM, "called");
- IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-
const auto storage = applet->GetBroker().PopInteractiveDataToGame();
if (storage == nullptr) {
LOG_ERROR(Service_AM,
"storage is a nullptr. There is no data in the current interactive channel");
-
+ IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ERR_NO_DATA_IN_CHANNEL);
return;
}
+ IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS);
rb.PushIpcInterface<IStorage>(std::move(*storage));
}