video: Destroy all video instances in e_comp_wl_video_shutdown()

Change-Id: Id373a70657d1adc3d64f30c1a855abf214262263

diff --git a/src/bin/video/e_comp_wl_video.c b/src/bin/video/e_comp_wl_video.c
index 3571a0ca0164dac348468595bf33c6f779af047b..eb5597074a33cceae60196fd9279f248d131f9a5 100644 (file)
--- a/src/bin/video/e_comp_wl_video.c
+++ b/src/bin/video/e_comp_wl_video.c
@@ -212,8 +212,6 @@ _e_video_destroy(E_Video *video)
 
    e_client_video_unset(video->ec);
 
-   video_list = eina_list_remove(video_list, video);
-
    free(video);
 }
 
@@ -235,6 +233,8 @@ _e_video_cb_ec_remove(void *data, int type, void *event)
 
    _e_video_destroy(video);
 
+   video_list = eina_list_remove(video_list, video);
+
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -245,6 +245,8 @@ _e_comp_wl_video_object_destroy(struct wl_resource *resource)
    EINA_SAFETY_ON_NULL_RETURN(video);
 
    _e_video_destroy(video);
+
+   video_list = eina_list_remove(video_list, video);
 }
 
 static void
@@ -538,6 +540,7 @@ e_comp_wl_video_shutdown(void)
 
    E_FREE_FUNC(e_comp->wl_comp_data->video.global, wl_global_destroy);
    E_FREE_LIST(video_hdlrs, ecore_event_handler_del);
+   E_FREE_LIST(video_list, _e_video_destroy);
 
    e_info_server_hook_set("vbuf", NULL, NULL);
    e_info_server_hook_set("video-to-primary", NULL, NULL);