From d68795c665fe73da55f0427d1ff05281d46c3de9 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Mon, 19 Nov 2018 15:10:01 -0500
Subject: software_keyboard: Return correct result code on user cancel
 operation

---
 src/core/hle/service/am/applets/applets.cpp           | 1 -
 src/core/hle/service/am/applets/software_keyboard.cpp | 4 +---
 src/core/hle/service/am/applets/software_keyboard.h   | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/core')

diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp
index c81bd59b2..8adb81823 100644
--- a/src/core/hle/service/am/applets/applets.cpp
+++ b/src/core/hle/service/am/applets/applets.cpp
@@ -5,7 +5,6 @@
 #include <cstring>
 #include "common/assert.h"
 #include "core/core.h"
-#include "core/frontend/applets/software_keyboard.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/server_port.h"
 #include "core/hle/service/am/am.h"
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index ca9ef7e7d..aec6bf2a7 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -74,7 +74,7 @@ bool SoftwareKeyboard::TransactionComplete() const {
 }
 
 ResultCode SoftwareKeyboard::GetStatus() const {
-    return status;
+    return RESULT_SUCCESS;
 }
 
 void SoftwareKeyboard::ExecuteInteractive() {
@@ -118,7 +118,6 @@ void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) {
 
     if (text.has_value()) {
         std::vector<u8> output_sub(SWKBD_OUTPUT_BUFFER_SIZE);
-        status = RESULT_SUCCESS;
 
         if (config.utf_8) {
             const u64 size = text->size() + 8;
@@ -154,7 +153,6 @@ void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) {
 
         broker->SignalStateChanged();
     } else {
-        status = ResultCode(-1);
         output_main[0] = 1;
         complete = true;
         broker->PushNormalDataFromApplet(IStorage{output_main});
diff --git a/src/core/hle/service/am/applets/software_keyboard.h b/src/core/hle/service/am/applets/software_keyboard.h
index 405c58851..16e1fff66 100644
--- a/src/core/hle/service/am/applets/software_keyboard.h
+++ b/src/core/hle/service/am/applets/software_keyboard.h
@@ -64,7 +64,6 @@ private:
     std::u16string initial_text;
     bool complete = false;
     std::vector<u8> final_data;
-    ResultCode status = ResultCode(-1);
 };
 
 } // namespace Service::AM::Applets
-- 
cgit v1.2.3