From f036639357d1a36489c28f9831e58423262988fb Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Wed, 20 Aug 2014 16:40:28 +0200 Subject: [PATCH] ilmControl: destroy output objects, even w/o controller Signed-off-by: Marcus Fritzsch --- .../ilmControl/src/ilm_control_wayland_platform.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c index a1968f5..3aae4c5 100644 --- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c +++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c @@ -951,6 +951,21 @@ static void destroy_control_resources(void) { struct ilm_control_context *ctx = &ilm_context; + // free resources of output objects + if (! ctx->wl.controller) { + struct screen_context *ctx_scrn; + struct screen_context *next; + + wl_list_for_each_safe(ctx_scrn, next, &ctx->wl.list_screen, link) { + if (ctx_scrn->output != NULL) { + wl_output_destroy(ctx_scrn->output); + } + + wl_list_remove(&ctx_scrn->link); + free(ctx_scrn); + } + } + if (ctx->wl.controller != NULL) { { struct surface_context *l; -- 2.7.4