summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-06-27 05:25:04 +0200
committerGitHub <noreply@github.com>2020-06-27 05:25:04 +0200
commit705cccb1e44afaed96723052cdad9c24ab12529a (patch)
treeb1e14ab20fc69ba33c5e092afca3cb57136661e4 /src/core
parentMerge pull request #4147 from ReinUsesLisp/hset2-imm (diff)
parentPrevent nullptr dereference on swkbd error case (diff)
downloadyuzu-705cccb1e44afaed96723052cdad9c24ab12529a.tar
yuzu-705cccb1e44afaed96723052cdad9c24ab12529a.tar.gz
yuzu-705cccb1e44afaed96723052cdad9c24ab12529a.tar.bz2
yuzu-705cccb1e44afaed96723052cdad9c24ab12529a.tar.lz
yuzu-705cccb1e44afaed96723052cdad9c24ab12529a.tar.xz
yuzu-705cccb1e44afaed96723052cdad9c24ab12529a.tar.zst
yuzu-705cccb1e44afaed96723052cdad9c24ab12529a.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/am/applets/software_keyboard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index d14076b02..fbe3686ae 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -60,7 +60,7 @@ void SoftwareKeyboard::Initialize() {
std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig));
const auto work_buffer_storage = broker.PopNormalDataToApplet();
- ASSERT(work_buffer_storage != nullptr);
+ ASSERT_OR_EXECUTE(work_buffer_storage != nullptr, { return; });
const auto& work_buffer = work_buffer_storage->GetData();
if (config.initial_string_size == 0)