From 74071e056a93c03b2cf2e6597d113ae970c6928a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 29 Apr 2014 15:01:16 -0700
Subject: [PATCH] desktop-shell: End popup when starting a touch shell grab

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77345
---
 desktop-shell/shell.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 79bd65c1..e4c02959 100644
--- 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;