summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vlad <marius-cristian.vlad@nxp.com>2018-04-30 14:10:32 +0300
committerEmre Ucan <eucan@de.adit-jv.com>2018-09-24 17:51:28 +0200
commit411a185c1e7c294199d7680202d6dc2fea62be02 (patch)
tree78bdc54c461be268a9c07511589b11e4e63fcb8b
parent051553aa302bbdefe874734d44de413ed0551504 (diff)
downloadwayland-ivi-extension-411a185c1e7c294199d7680202d6dc2fea62be02.tar.gz
Due to clone mode infrastructure added by Pekka Paalanen weston_output is actually a entry to weston_head.
This fixes the situation where we get invalid protocol object when using layer-add-surfaces. Signed-off-by: Marius Vlad <marius-cristian.vlad@nxp.com>
-rw-r--r--weston-ivi-shell/src/ivi-controller.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c
index ede2f03..b5ea9fe 100644
--- a/weston-ivi-shell/src/ivi-controller.c
+++ b/weston-ivi-shell/src/ivi-controller.c
@@ -1402,7 +1402,7 @@ controller_create_screen(struct wl_client *client,
struct wl_resource *output_resource,
uint32_t id)
{
- struct weston_output *weston_output =
+ struct weston_head *weston_head =
wl_resource_get_user_data(output_resource);
struct wl_resource *screen_resource;
struct ivicontroller *ctrl = wl_resource_get_user_data(resource);
@@ -1410,7 +1410,7 @@ controller_create_screen(struct wl_client *client,
wl_list_for_each(iviscrn, &ctrl->shell->list_screen, link) {
- if (weston_output != iviscrn->output) {
+ if (weston_head->output != iviscrn->output) {
continue;
}