From: Hyunho Kang <hhstark.kang@samsung.com>
Date: Thu, 24 Aug 2017 01:04:16 +0000 (+0900)
Subject: Fix toolkit resource leak
X-Git-Tag: submit/tizen_3.0/20170908.130137~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41a3ae2f8eb925b8e5b529eeb789e8582ddce53d;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git

Fix toolkit resource leak

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

diff --git a/watch-control/src/control.c b/watch-control/src/control.c
index cd152484..26be1505 100644
--- a/watch-control/src/control.c
+++ b/watch-control/src/control.c
@@ -386,6 +386,10 @@ static void __screen_connector_toolkit_evas_removed_cb(const char *appid, const
 	cur_image = evas_object_data_get(__win, "tbm,watch");
 	if (cur_image == image) {
 		evas_object_data_set(__win, "tbm,watch", NULL);
+		if (__toolkit)
+			screen_connector_toolkit_evas_remove(__toolkit);
+		if (__rid_toolkit)
+			screen_connector_toolkit_evas_remove(__rid_toolkit);
 		__toolkit = NULL;
 		__rid_toolkit = NULL;
 		__is_bound = false;
@@ -435,6 +439,7 @@ API int watch_manager_set_resource_id(int resource_id)
 	if (ret != AUL_R_OK) {
 		_E("Fail to get appid of %d", resource_id);
 		screen_connector_toolkit_evas_remove(handle);
+		__rid_toolkit = NULL;
 		return -1;
 	}
 	_D("appid(%s), rid(%d)", __watch_appid, resource_id);