Clear notification callbacks when ivi_layout_surface destroyed.

Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>

1 files changed, 3 insertions, 0 deletions

diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 68388602..8a744bba 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1357,6 +1357,7 @@ ivi_layout_surfaceRemove(struct ivi_layout_surface *ivisurf)
         wl_list_remove(&ivisurf->link);
     }
     remove_ordersurface_from_layer(ivisurf);
+    ivi_layout_surfaceRemoveNotification(ivisurf);
 
     wl_list_for_each(notification,
             &layout->surface_notification.list_remove, link) {
@@ -2676,6 +2677,8 @@ ivi_layout_surfaceSetNativeContent(struct weston_surface *surface,
             (*(ivisurf->content_observer.callback))(ivisurf,
                                     0, ivisurf->content_observer.userdata);
         }
+
+        ivi_layout_surfaceRemoveNotification(ivisurf);
         return 0;
     }