summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>2015-02-06 16:08:52 +0900
committerBryce Harrington <bryce@osg.samsung.com>2015-02-06 16:22:15 -0800
commit82cc25b986669abf0a516eac0db936c5cd1e916b (patch)
treedf353920dd795b43bb9575cbf12119c98a5b6ed9
parent7b9efcbcbf3d8916160b39dfc2c28ee1c309e4ff (diff)
downloadweston-82cc25b986669abf0a516eac0db936c5cd1e916b.tar.gz
ivi-shell: SEGV occurs when multi touch happens in transition
of application launching. This is because cancel callback is mistakenly set to weston_touch_grab_interface. To fix this issue, add a callback, touch_move_workspace_grab_frame and set it to the weston_touch_grab_interface like desktop-shell. Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-rw-r--r--ivi-shell/hmi-controller.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index 36a1b568..2d15e063 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -1389,6 +1389,11 @@ pointer_move_workspace_grab_cancel(struct weston_pointer_grab *grab)
}
static void
+touch_move_workspace_grab_frame(struct weston_touch_grab *grab)
+{
+}
+
+static void
touch_move_workspace_grab_cancel(struct weston_touch_grab *grab)
{
struct touch_grab *tg = (struct touch_grab *)grab;
@@ -1408,6 +1413,7 @@ static const struct weston_touch_grab_interface touch_move_grab_workspace_interf
touch_nope_grab_down,
touch_move_workspace_grab_up,
touch_move_grab_motion,
+ touch_move_workspace_grab_frame,
touch_move_workspace_grab_cancel
};