ivi-shell: make ivi_layout_surface destruction explicit
Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index f9c2583..a147353 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -130,6 +130,22 @@
}
}
+static void
+layout_surface_cleanup(struct ivi_shell_surface *ivisurf)
+{
+ assert(ivisurf->layout_surface != NULL);
+
+ ivi_layout_surface_destroy(ivisurf->layout_surface);
+ ivisurf->layout_surface = NULL;
+
+ ivisurf->surface->configure = NULL;
+ ivisurf->surface->configure_private = NULL;
+ ivisurf->surface = NULL;
+
+ // destroy weston_surface destroy signal.
+ wl_list_remove(&ivisurf->surface_destroy_listener.link);
+}
+
/*
* The ivi_surface wl_resource destructor.
*
@@ -154,14 +170,8 @@
assert(ivisurf != NULL);
- if (ivisurf->surface!=NULL) {
- ivisurf->surface->configure = NULL;
- ivisurf->surface->configure_private = NULL;
- ivisurf->surface = NULL;
- }
-
- wl_list_remove(&ivisurf->surface_destroy_listener.link);
- wl_list_remove(&ivisurf->link);
+ if (ivisurf->layout_surface != NULL)
+ layout_surface_cleanup(ivisurf);
if (ivisurf->resource != NULL) {
wl_resource_set_user_data(ivisurf->resource, NULL);