Add Null Check logic

__watcher_tbl can be already destroyed by
screen_connector_watcher_evas_fini call

Change-Id: I783c4bcdea20d02ced1910a066d0d1652f0d5d9a
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

diff --git a/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c b/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c
index 9cb94d4..4cb233e 100644 (file)
--- a/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c
+++ b/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c
@@ -75,6 +75,7 @@ EXPORT_API int screen_connector_watcher_evas_fini(void)
        if (__watcher_tbl)
                g_hash_table_destroy(__watcher_tbl);
 
+       __watcher_tbl = NULL;
        return screen_connector_watcher_fini();
 }
 
@@ -440,11 +441,13 @@ static void __watcher_missing_cb(struct tizen_remote_surface *trs, void *data)
                return;
        }
 
-       g_hash_table_remove(__watcher_tbl, watcher_evas_h->img_tbm);
+       if (__watcher_tbl != NULL && watcher_evas_h->img_tbm != NULL) {
+               g_hash_table_remove(__watcher_tbl, watcher_evas_h->img_tbm);
 
-       /* Remove data used in accessibility */
-       plug_id = evas_object_data_del(watcher_evas_h->img_tbm, "___PLUGID");
-       free(plug_id);
+               /* Remove data used in accessibility */
+               plug_id = evas_object_data_del(watcher_evas_h->img_tbm, "___PLUGID");
+               free(plug_id);
+       }
 
        appid = screen_connector_watcher_get_appid(watcher_evas_h->watcher_h);
        watcher_evas_h->ops->removed(appid, watcher_evas_h->img_tbm, watcher_evas_h->data);