ivi-shell: call weston_layer_fini()
This ensures the layers are torn down properly. See commit: libweston: add weston_layer_fini() There would be a lot more to tear down here, but that is for another time. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
@@ -57,6 +57,9 @@ ivi_layout_surface_create(struct weston_surface *wl_surface,
|
|||||||
void
|
void
|
||||||
ivi_layout_init_with_compositor(struct weston_compositor *ec);
|
ivi_layout_init_with_compositor(struct weston_compositor *ec);
|
||||||
|
|
||||||
|
void
|
||||||
|
ivi_layout_fini(void);
|
||||||
|
|
||||||
void
|
void
|
||||||
ivi_layout_surface_destroy(struct ivi_layout_surface *ivisurf);
|
ivi_layout_surface_destroy(struct ivi_layout_surface *ivisurf);
|
||||||
|
|
||||||
|
|||||||
@@ -2053,6 +2053,16 @@ ivi_layout_init_with_compositor(struct weston_compositor *ec)
|
|||||||
sizeof(struct ivi_layout_interface));
|
sizeof(struct ivi_layout_interface));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ivi_layout_fini(void)
|
||||||
|
{
|
||||||
|
struct ivi_layout *layout = get_instance();
|
||||||
|
|
||||||
|
weston_layer_fini(&layout->layout_layer);
|
||||||
|
|
||||||
|
/* XXX: tear down everything else */
|
||||||
|
}
|
||||||
|
|
||||||
static struct ivi_layout_interface ivi_layout_interface = {
|
static struct ivi_layout_interface ivi_layout_interface = {
|
||||||
/**
|
/**
|
||||||
* commit all changes
|
* commit all changes
|
||||||
|
|||||||
@@ -353,6 +353,8 @@ shell_destroy(struct wl_listener *listener, void *data)
|
|||||||
free(ivisurf);
|
free(ivisurf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ivi_layout_fini();
|
||||||
|
|
||||||
free(shell);
|
free(shell);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user