OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-26 16:50:13 +00:00
Code Issues Projects Releases Wiki Activity

software_keyboard: Fix erroneous extra PushNormalData

Browse Source
This commit is contained in:
Zach Hilman 2018-11-19 16:30:17 -05:00
parent d68795c665
commit a9fa890f14
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/service/am/applets/software_keyboard.cpp
View File

@ -127,7 +127,7 @@ void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) {
std::memcpy(output_sub.data() + 8, new_text.data(), std::memcpy(output_sub.data() + 8, new_text.data(),
std::min(new_text.size(), SWKBD_OUTPUT_BUFFER_SIZE - 8)); std::min(new_text.size(), SWKBD_OUTPUT_BUFFER_SIZE - 8));
output_main[0] = config.text_check; output_main[0] = INTERACTIVE_STATUS_OK;
std::memcpy(output_main.data() + 4, new_text.data(), std::memcpy(output_main.data() + 4, new_text.data(),
std::min(new_text.size(), SWKBD_OUTPUT_BUFFER_SIZE - 4)); std::min(new_text.size(), SWKBD_OUTPUT_BUFFER_SIZE - 4));
} else { } else {
@ -136,7 +136,7 @@ void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) {
std::memcpy(output_sub.data() + 8, text->data(), std::memcpy(output_sub.data() + 8, text->data(),
std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 8)); std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 8));
output_main[0] = config.text_check; output_main[0] = INTERACTIVE_STATUS_OK;
std::memcpy(output_main.data() + 4, text->data(), std::memcpy(output_main.data() + 4, text->data(),
std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 4)); std::min(text->size() * 2, SWKBD_OUTPUT_BUFFER_SIZE - 4));
} }
@ -147,7 +147,6 @@ void SoftwareKeyboard::WriteText(std::optional<std::u16string> text) {
if (complete) { if (complete) {
broker->PushNormalDataFromApplet(IStorage{output_main}); broker->PushNormalDataFromApplet(IStorage{output_main});
} else { } else {
broker->PushNormalDataFromApplet(IStorage{output_main});
broker->PushInteractiveDataFromApplet(IStorage{output_sub}); broker->PushInteractiveDataFromApplet(IStorage{output_sub});
} }