From 9c001fca5aa2d24a3a42a8a7666c9d3b6af7dd2a Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 22 Mar 2019 12:26:19 +0000 Subject: [PATCH] compositor: Don't ignore --use-pixman for Wayland backend We loaded the use-pixman configuration value from both the command line and the configuration file, but completely ignored the former. Make sure we actually use both. Tested with all permutations of config/command line. Signed-off-by: Daniel Stone Reviewed-by: Pekka Paalanen Tested-by: Emmanuel Gil Peyrot (cherry picked from commit 8a4585c27f5fa88511dbfafe4ae7403df3f83edc) --- compositor/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compositor/main.c b/compositor/main.c index 518248cb..b6ac6ea3 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -2767,7 +2767,7 @@ load_wayland_backend(struct weston_compositor *c, parse_options(wayland_options, ARRAY_LENGTH(wayland_options), argc, argv); config.sprawl = sprawl_; config.fullscreen = fullscreen_; - config.use_pixman = use_pixman_config_; + config.use_pixman = use_pixman_; section = weston_config_get_section(wc, "shell", NULL, NULL); weston_config_section_get_string(section, "cursor-theme",