diff options
author | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-03-17 10:29:19 +0100 |
---|---|---|
committer | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-03-17 10:29:19 +0100 |
commit | 2113642587f98e2e4f82e4cb786a5740b555bc45 (patch) | |
tree | 9d44e1de17c4277ee981f84b088b1fab49247ffc | |
parent | 0c837964c3464d782e824ba5a0f7197096835d5a (diff) | |
parent | 8a4948f92c82f7409f53e444fa54784e34fa87c0 (diff) | |
download | wayland-ivi-extension-2113642587f98e2e4f82e4cb786a5740b555bc45.tar.gz |
Merge remote-tracking branch 'upstream/pull/151'
* upstream/pull/151
ivi-controller: Fix the problem of assigning an address to a pointer
Reviewed-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
Reviewed-by: Tran Ba Khang <khang.tranba@vn.bosch.com>
-rw-r--r-- | weston-ivi-shell/src/ivi-controller.c | 4 |
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 c27966a..e6de020 100644 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c @@ -1429,14 +1429,14 @@ controller_screen_get(struct wl_client *client, int32_t layer_count, i; uint32_t id; - lyt = iviscrn->shell->interface; - if (!iviscrn) { ivi_wm_screen_send_error(resource, IVI_WM_SCREEN_ERROR_NO_SCREEN, "the output is already destroyed"); return; } + lyt = iviscrn->shell->interface; + if (param & IVI_WM_PARAM_RENDER_ORDER) { lyt->get_layers_on_screen(iviscrn->output, &layer_count, &layer_list); |