Fix bug about getting OPR

Change-Id: Ia309f817c6069c75f0b7e808088fa79dfca73c33
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/watch-control/src/control.c b/watch-control/src/control.c
index 3c063dd..b287bcb 100644 (file)
--- a/watch-control/src/control.c
+++ b/watch-control/src/control.c
@@ -192,7 +192,7 @@ static void __screen_connector_toolkit_evas_added_cb(const char *appid, const ch
        int w, h, x, y;
        evas_object_geometry_get(image, &x, &y, &w, &h);
 
-       _D("obj added");
+       _D("obj(%p) added", image);
        _D("w: %d, h: %d, x: %d y: %d", w, h, x, y);
        evas_object_smart_callback_call(__win, WATCH_SMART_SIGNAL_ADDED, image);
        evas_object_data_set(__win, "tbm,watch", image);
@@ -203,9 +203,13 @@ static void __screen_connector_toolkit_evas_added_cb(const char *appid, const ch
 static void __screen_connector_toolkit_evas_removed_cb(const char *appid, const char *instance_id, int pid,
        Evas_Object *image, void *data)
 {
-       _D("obj removed");
+       Evas_Object *cur_image;
+
+       _D("obj(%p) removed", image);
        evas_object_smart_callback_call(__win, WATCH_SMART_SIGNAL_REMOVED, image);
-       evas_object_data_set(__win, "tbm,watch", NULL);
+       cur_image = evas_object_data_get(__win, "tbm,watch");
+       if (cur_image == image)
+               evas_object_data_set(__win, "tbm,watch", NULL);
 }
 
 static void __screen_connector_toolkit_evas_updated_cb(const char *appid, const char *instance_id, int pid,