mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

web: Updated for 10.x.

Browse Source
This commit is contained in:
yellows8 2020-06-15 15:40:05 -04:00
parent 3d4f61735a
commit 044eac2f3d
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nx/include/switch/applets/web.h
View File

@ -28,6 +28,7 @@ typedef enum {
WebExitReason_Requested = 0x2, ///< The applet exited since \ref webConfigRequestExit was used. WebExitReason_Requested = 0x2, ///< The applet exited since \ref webConfigRequestExit was used.
WebExitReason_LastUrl = 0x3, ///< The applet exited due to LastUrl handling, see \ref webReplyGetLastUrl. WebExitReason_LastUrl = 0x3, ///< The applet exited due to LastUrl handling, see \ref webReplyGetLastUrl.
WebExitReason_ErrorDialog = 0x7, ///< The applet exited after displaying an error dialog. WebExitReason_ErrorDialog = 0x7, ///< The applet exited after displaying an error dialog.
WebExitReason_UnknownE = 0xE, ///< Unknown
} WebExitReason; } WebExitReason;
/// Button values for \ref webConfigSetBootFooterButtonVisible. /// Button values for \ref webConfigSetBootFooterButtonVisible.

9
nx/source/applets/web.c
View File

@ -692,6 +692,7 @@ Result webConfigSetMediaPlayerUi(WebCommonConfig* config, bool flag) {
} }
Result webConfigShow(WebCommonConfig* config, WebCommonReply *out) { Result webConfigShow(WebCommonConfig* config, WebCommonReply *out) {
Result rc=0;
void* reply = NULL; void* reply = NULL;
size_t size = 0; size_t size = 0;
WebShimKind shimKind = _webGetShimKind(config); WebShimKind shimKind = _webGetShimKind(config);
@ -715,7 +716,13 @@ Result webConfigShow(WebCommonConfig* config, WebCommonReply *out) {
} }
} }
return _webShow(&config->holder, config->appletid, config->version, &config->arg, sizeof(config->arg), reply, size); rc = _webShow(&config->holder, config->appletid, config->version, &config->arg, sizeof(config->arg), reply, size);
if (R_SUCCEEDED(rc) && hosversionAtLeast(10,0,0) && (shimKind == WebShimKind_Web || shimKind == WebShimKind_Offline)) {
WebExitReason reason;
rc = webReplyGetExitReason(out, &reason);
if (R_SUCCEEDED(rc) && reason == WebExitReason_UnknownE) rc = MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen);
}
return rc;
} }
Result webConfigRequestExit(WebCommonConfig* config) { Result webConfigRequestExit(WebCommonConfig* config) {