diff options
| author | Daniel Stone <daniels@collabora.com> | 2019-03-22 12:26:19 +0000 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2019-06-19 20:11:13 +0300 |
| commit | 9c001fca5aa2d24a3a42a8a7666c9d3b6af7dd2a (patch) | |
| tree | 84dda2d32bcfa6ff8faac175b6b5db3a3f8f442b | |
| parent | a219af3858e4c0a208647f6863e530b739f9b583 (diff) | |
| download | weston-9c001fca5aa2d24a3a42a8a7666c9d3b6af7dd2a.tar.gz | |
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 <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
(cherry picked from commit 8a4585c27f5fa88511dbfafe4ae7403df3f83edc)
| -rw-r--r-- | compositor/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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", |