From 72bebc66e5ea5088dd037917abe9eddd88b8d32b Mon Sep 17 00:00:00 2001 From: Aleix Pol Gonzalez Date: Thu, 18 Jan 2024 12:10:35 +0100 Subject: [PATCH] ibus: avoid a crash when context is not ready This amends 84cf0e2be54d9ad183db063fd429b792c67edd18 Pick-to: 6.5 Change-Id: Ia560f785764d4ba0e4aa66943effb9f16a38e699 Reviewed-by: Liang Qi Reviewed-by: Inho Lee (cherry picked from commit 0d923c2097578682b8553707834ccf52d7cd52e2) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 4f9c75901e1f02eda8fc8b3349b895779da9246e) --- .../platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 4a1e9db75e6..00c7884cda2 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -125,7 +125,6 @@ QIBusPlatformInputContext::QIBusPlatformInputContext () if (ok && enableSync == 1) m_eventFilterUseSynchronousMode = true; } - d->context->setClientCommitPreedit(QIBusPropTypeClientCommitPreedit(true)); } QIBusPlatformInputContext::~QIBusPlatformInputContext (void) @@ -719,6 +718,8 @@ void QIBusPlatformInputContextPrivate::createBusProxy() }; context->SetCapabilities(IBUS_CAP_PREEDIT_TEXT|IBUS_CAP_FOCUS|IBUS_CAP_SURROUNDING_TEXT); + context->setClientCommitPreedit(QIBusPropTypeClientCommitPreedit(true)); + if (debug) qDebug(">>>> bus connected!"); busConnected = true;