diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-11-19 15:10:01 -0500 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-19 15:10:01 -0500 |
| commit | d68795c665fe73da55f0427d1ff05281d46c3de9 (patch) | |
| tree | 4e6af5284a6d2484c289fd8f5d57464118522b2b | |
| parent | 32775125b7af14cf488fdcbc4a61c00507c2d4a5 (diff) | |
software_keyboard: Return correct result code on user cancel operation
| -rw-r--r-- | src/core/hle/service/am/applets/applets.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp index c81bd59b28..8adb818230 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 ca9ef7e7d4..aec6bf2a71 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 405c58851f..16e1fff665 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 |