imv1: fix null text_input crash by clearing it later (#2261)

WayfireWM · Mar 25, 2024 · 3deeeba · 3deeeba
1 parent 599ace9
commit 3deeeba
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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)