aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2017-02-08 11:07:27 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2017-02-08 21:47:21 -0200
commit56a1460777d1e24b1dfb426cad2b103740936a83 (patch)
treeff75a9db5156270a5a120ccadd0096716c9792a8
parentbfa91b1250b6136d4edae5c180535f19131a0b02 (diff)
downloadmeta-freescale-56a1460777d1e24b1dfb426cad2b103740936a83.tar.gz
meta-freescale-56a1460777d1e24b1dfb426cad2b103740936a83.tar.bz2
meta-freescale-56a1460777d1e24b1dfb426cad2b103740936a83.zip
weston: Fix patch for no input device handling2.2
The previous patch had a logic error. The upstream submission was correct, so this just synchronizes the patch. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch b/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch
index 1304cef2..e3b1fa8a 100644
--- a/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch
+++ b/recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch
@@ -7,6 +7,8 @@ Starting an xterm with no input device led to a crash
because weston_wm_pick_seat() was returning garbage and
weston_wm_selection_init() was trying to use the garbage.
+Upstream-Status: Accepted [https://cgit.freedesktop.org/wayland/weston/commit/?id=e7fff215ada3fd3d1b2af664888f960c082f9065]
+
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
xwayland/selection.c | 10 +++++++---
@@ -21,7 +23,7 @@ Index: weston-1.11.0/xwayland/selection.c
wm->atom.clipboard, mask);
seat = weston_wm_pick_seat(wm);
-+ if (seat != NULL)
++ if (seat == NULL)
+ return;
wm->selection_listener.notify = weston_wm_set_selection;
wl_signal_add(&seat->selection_signal, &wm->selection_listener);