xwayland: Add mode for current mode, not the last mode in the list

1 files changed, 6 insertions, 4 deletions

diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c
index e596bbdc9..e3bbd870b 100644
--- a/hw/xfree86/xwayland/xwayland-output.c
+++ b/hw/xfree86/xwayland/xwayland-output.c
@@ -264,11 +264,13 @@ display_handle_mode(void *data,
 {
     struct xwl_output *xwl_output = data;
 
-    xwl_output->width = width;
-    xwl_output->height = height;
+    if (flags & WL_OUTPUT_MODE_CURRENT) {
+	xwl_output->width = width;
+	xwl_output->height = height;
 
-    xwl_output->xwl_screen->width = width;
-    xwl_output->xwl_screen->height = height;
+	xwl_output->xwl_screen->width = width;
+	xwl_output->xwl_screen->height = height;
+    }
 }
 
 static const struct wl_output_listener output_listener = {