From 59382cab1f47faa0ae7c4273f225c55ba877409e Mon Sep 17 00:00:00 2001
From: yellows8 <yellows8@users.noreply.github.com>
Date: Thu, 20 Dec 2018 21:08:36 -0500
Subject: [PATCH] Added LibnxError_LibAppletBadExit, which is now used in
 swkbd.

---
 nx/include/switch/result.h | 1 +
 nx/source/applets/swkbd.c  | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nx/include/switch/result.h b/nx/include/switch/result.h
index 2fcdedef..e55f25c5 100644
--- a/nx/include/switch/result.h
+++ b/nx/include/switch/result.h
@@ -122,6 +122,7 @@ enum {
     LibnxError_ApmFailedToInitialize,
     LibnxError_NvinfoFailedToInitialize,
     LibnxError_NvbufFailedToInitialize,
+    LibnxError_LibAppletBadExit,
 };
 
 /// libnx binder error codes
diff --git a/nx/source/applets/swkbd.c b/nx/source/applets/swkbd.c
index 1fd0ea9e..98b4cdf5 100644
--- a/nx/source/applets/swkbd.c
+++ b/nx/source/applets/swkbd.c
@@ -37,7 +37,7 @@ static Result _swkbdProcessOutput(AppletHolder* h, char* out_string, size_t out_
     if (strbuf) memset(strbuf, 0, strbuf_size+2);
 
     if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, 0, &CloseResult, sizeof(CloseResult));
-    if (R_SUCCEEDED(rc) && CloseResult!=0) rc = 0x29f;//TODO: See below.
+    if (R_SUCCEEDED(rc) && CloseResult!=0) rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
     if (R_SUCCEEDED(rc)) rc = appletStorageRead(&outstorage, sizeof(CloseResult), strbuf, strbuf_size);
 
     if (R_SUCCEEDED(rc)) _swkbdConvertToUTF8(out_string, strbuf, out_string_size-1);
@@ -85,11 +85,10 @@ Result swkbdShow(SwkbdConfig* c, char* out_string, size_t out_string_size) {
         LibAppletExitReason reason = appletHolderGetExitReason(&holder);
 
         if (reason == LibAppletExitReason_Canceled) {
-            rc = 0x29f;//TODO: Official sw returns this, replace it with something else.
+            rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
         }
         else if (reason == LibAppletExitReason_Abnormal || reason == LibAppletExitReason_Unexpected) {
-            //TODO: Official sw asserts here - return a proper error here.
-            return -1;
+            rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
         }
         else { //success
             rc = _swkbdProcessOutput(&holder, out_string, out_string_size);