xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ccffe90c3646a677c11e7305d9aefc7e51ef8c81
Author: Simon Ser <contact at emersion.fr>
Date:   Fri Oct 22 18:19:48 2021 +0200

    xwayland: fix -noTouchPointerEmulation
    
    Passing -noTouchPointerEmulation results in an error about the
    flag not being recognized.
    
    Signed-off-by: Simon Ser <contact at emersion.fr>
    Fixes: 7d34b1f2b7c6 ("xwayland: add -noTouchPointerEmulation")

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 801af38aa..21587dbb6 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -188,6 +188,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
     }
     else if (strcmp(argv[i], "-noTouchPointerEmulation") == 0) {
         touchEmulatePointer = FALSE;
+        return 1;
     }
 
     return 0;