]> code.ossystems Code Review - meta-freescale.git/commitdiff
weston: Fix patch for no input device handling 2.2
authorTom Hochstein <tom.hochstein@nxp.com>
Wed, 8 Feb 2017 17:07:27 +0000 (11:07 -0600)
committerOtavio Salvador <otavio@ossystems.com.br>
Wed, 8 Feb 2017 23:47:21 +0000 (21:47 -0200)
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>
recipes-graphics/wayland/weston/0007-xwayland-Fix-crash-when-run-with-no-input-device.patch

index 1304cef22e68433c55da49aa11104b12c954b6a5..e3b1fa8a74f896b960072db84f3597904e477429 100644 (file)
@@ -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);