From f4715b9ac5c12e0cf5df3cf9d8776da9b0cbb948 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 13 May 2021 16:04:03 +0200 Subject: [PATCH] inputmethod: deactivate the input method when we textinputv3 is committed as disabled Fixes InputMethodTest::testEnableDisableV3 on my system when running on Valgrind, should hopefully also fix on CI. --- src/inputmethod.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp index a18b875cf3..06a8a48b39 100644 --- a/src/inputmethod.cpp +++ b/src/inputmethod.cpp @@ -325,12 +325,10 @@ void InputMethod::stateCommitted(uint32_t serial) return; } - if (!isActive() && textInputV3->isEnabled()) { - show(); + if (auto inputContext = waylandServer()->inputMethod()->context()) { + inputContext->sendCommitState(serial); } - - auto inputContext = waylandServer()->inputMethod()->context(); - inputContext->sendCommitState(serial); + setActive(textInputV3->isEnabled()); } void InputMethod::setEnabled(bool enabled)