desktop-shell: End popup when starting a touch shell grab

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77345
11 years ago · 74071e056a
parent 7b83ae433f
commit 74071e056a
1 changed files with 3 additions and 0 deletions
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@ -364,6 +364,9 @@ shell_touch_grab_start(struct shell_touch_grab *grab,
 {
 	struct desktop_shell *shell = shsurf->shell;

+	if (touch->seat->pointer)
+		popup_grab_end(touch->seat->pointer);
+
 	grab->grab.interface = interface;
 	grab->shsurf = shsurf;
 	grab->shsurf_destroy_listener.notify = destroy_shell_grab_shsurf;