xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-output.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 427f8bc00981703abe3153b6da575faa69fe2748
Author: Robert Mader <robert.mader at posteo.de>
Date:   Wed Oct 16 19:14:06 2019 +0200

    xserver: Fix a typo
    
    If `need_rotate` is TRUE, we should check for the right rotate.

diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 42b96e821..da6316930 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -539,7 +539,7 @@ apply_output_change(struct xwl_output *xwl_output)
     need_rotate = (xwl_output->xdg_output == NULL);
 
     /* We need to rotate back the logical size for the mode */
-    if (need_rotate || xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180)) {
+    if (!need_rotate || xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180)) {
         mode_width = xwl_output->width;
         mode_height = xwl_output->height;
     } else {