Fix focus restoration upon x_mouse_leave again

* src/xterm.c (x_mouse_leave): Call xi_handle_focus_change after
changing the implicit focus.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 12234351a32..48502f12d8d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13213,8 +13213,13 @@ x_mouse_leave (struct x_display_info *dpyinfo)
 
       device = xi_device_from_id (dpyinfo, dpyinfo->client_pointer_device);
 
-      if (device)
-        device->focus_implicit_frame = NULL;
+      if (device && device->focus_implicit_frame)
+        {
+          device->focus_implicit_frame = NULL;
+
+          /* The focus might have changed; compute the new focus.  */
+          xi_handle_focus_change (dpyinfo);
+        }
     }
 #endif
 }