DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lingering parameter bug with APTREINIT (aka hax 2.x)

Browse Source
This commit is contained in:
fincs 2016-07-18 00:26:52 +02:00
parent 343d53f540
commit 24b9341c99
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libctru/source/services/apt.c
View File

@ -129,6 +129,20 @@ Result aptSendCommand(u32* aptcmdbuf)
return res; return res;
} }
static void aptClearParamQueue(void)
{
// Check for parameters?
for (;;)
{
APT_Command cmd;
Result res = APT_GlanceParameter(envGetAptAppId(), aptParameters, sizeof(aptParameters), NULL, &cmd, NULL, NULL);
if (R_FAILED(res) || cmd==APTCMD_NONE) break;
_aptDebug(2, cmd);
svcClearEvent(aptEvents[2]);
APT_CancelParameter(APPID_NONE, envGetAptAppId(), NULL);
}
}
static void aptInitCaptureInfo(aptCaptureBufInfo* capinfo) static void aptInitCaptureInfo(aptCaptureBufInfo* capinfo)
{ {
GSPGPU_CaptureInfo gspcapinfo; GSPGPU_CaptureInfo gspcapinfo;
@ -265,7 +279,10 @@ void aptExit(void)
closeAptLock = false; closeAptLock = false;
srvInit(); // Keep srv initialized srvInit(); // Keep srv initialized
} else } else
{
APT_Finalize(envGetAptAppId()); APT_Finalize(envGetAptAppId());
aptClearParamQueue();
}
svcSignalEvent(aptEvents[0]); svcSignalEvent(aptEvents[0]);
threadJoin(aptEventHandlerThread, U64_MAX); threadJoin(aptEventHandlerThread, U64_MAX);
@ -400,20 +417,6 @@ APT_Command aptWaitForWakeUp(APT_Transition transition)
return cmd; return cmd;
} }
static void aptClearParamQueue(void)
{
// Check for parameters?
for (;;)
{
APT_Command cmd;
Result res = APT_GlanceParameter(envGetAptAppId(), aptParameters, sizeof(aptParameters), NULL, &cmd, NULL, NULL);
if (R_FAILED(res) || cmd==APTCMD_NONE) break;
_aptDebug(2, cmd);
svcClearEvent(aptEvents[2]);
APT_CancelParameter(APPID_NONE, envGetAptAppId(), NULL);
}
}
static void aptScreenTransfer(NS_APPID appId, bool sysApplet) static void aptScreenTransfer(NS_APPID appId, bool sysApplet)
{ {
aptCallHook(APTHOOK_ONSUSPEND); aptCallHook(APTHOOK_ONSUSPEND);