diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2017-02-08 11:07:27 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-02-08 21:43:22 -0200 |
commit | 54766b111495605727d41740d572db1bba96b8f0 (patch) | |
tree | 9f26a384eae4d4158f4b60dafba5a29c5084de60 /recipes-graphics/wayland | |
parent | a2741b3eec46cc775a371989d75e01b29508c5b4 (diff) | |
download | meta-freescale-54766b111495605727d41740d572db1bba96b8f0.tar.gz |
weston: Fix patch for no input device handling
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>
Diffstat (limited to 'recipes-graphics/wayland')
-rw-r--r-- | recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch | 4 |
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 | |||
7 | because weston_wm_pick_seat() was returning garbage and | 7 | because weston_wm_pick_seat() was returning garbage and |
8 | weston_wm_selection_init() was trying to use the garbage. | 8 | weston_wm_selection_init() was trying to use the garbage. |
9 | 9 | ||
10 | Upstream-Status: Accepted [https://cgit.freedesktop.org/wayland/weston/commit/?id=e7fff215ada3fd3d1b2af664888f960c082f9065] | ||
11 | |||
10 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | 12 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> |
11 | --- | 13 | --- |
12 | xwayland/selection.c | 10 +++++++--- | 14 | xwayland/selection.c | 10 +++++++--- |
@@ -21,7 +23,7 @@ Index: weston-1.11.0/xwayland/selection.c | |||
21 | wm->atom.clipboard, mask); | 23 | wm->atom.clipboard, mask); |
22 | 24 | ||
23 | seat = weston_wm_pick_seat(wm); | 25 | seat = weston_wm_pick_seat(wm); |
24 | + if (seat != NULL) | 26 | + if (seat == NULL) |
25 | + return; | 27 | + return; |
26 | wm->selection_listener.notify = weston_wm_set_selection; | 28 | wm->selection_listener.notify = weston_wm_set_selection; |
27 | wl_signal_add(&seat->selection_signal, &wm->selection_listener); | 29 | wl_signal_add(&seat->selection_signal, &wm->selection_listener); |