From 3deeebaa159f9b2abf1cc379127e1bd652c90ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E4=BA=91?= Date: Mon, 25 Mar 2024 16:54:25 +0800 Subject: [PATCH] imv1: fix null text_input crash by clearing it later (#2261) --- plugins/protocols/input-method-v1.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/protocols/input-method-v1.cpp b/plugins/protocols/input-method-v1.cpp index 1b5f1e1a2..c12f8cf85 100644 --- a/plugins/protocols/input-method-v1.cpp +++ b/plugins/protocols/input-method-v1.cpp @@ -96,7 +96,6 @@ class wayfire_input_method_v1_context void deactivate(bool im_killed = false) { - this->text_input = NULL; wl_resource_set_user_data(context, NULL); if (im_killed) @@ -126,9 +125,11 @@ class wayfire_input_method_v1_context wl_resource_set_user_data(active_grab_keyboard, NULL); } + this->text_input = NULL; return; } + this->text_input = NULL; zwp_input_method_v1_send_deactivate(current_im, context); if (active_grab_keyboard)