From: Pekka Paalanen <pekka.paala...@collabora.co.uk>

Output make and model are not allowed to be NULL in the protocol, so
ensure they are not forgotten when enabling an output.

Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
---
 libweston/compositor.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libweston/compositor.c b/libweston/compositor.c
index 59b7fe24..e69d8f35 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -5521,6 +5521,7 @@ weston_output_enable(struct weston_output *output)
 {
        struct weston_compositor *c = output->compositor;
        struct weston_output *iterator;
+       struct weston_head *head;
        int x = 0, y = 0;
 
        if (output->enabled) {
@@ -5535,6 +5536,11 @@ weston_output_enable(struct weston_output *output)
                return -1;
        }
 
+       wl_list_for_each(head, &output->head_list, output_link) {
+               assert(head->make);
+               assert(head->model);
+       }
+
        iterator = container_of(c->output_list.prev,
                                struct weston_output, link);
 
-- 
2.13.6

_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to