Wrong the contidion for checking watch-appid

- In case of restoring watchface, the previous watch appid is the same
  as the current appid to launch
- The condition for checking appid is useless

Change-Id: I30c1211de4ac72a5a11290d6f6b59eb69aa7d006
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

diff --git a/watch-control/src/control.c b/watch-control/src/control.c
index 0746e3b..8751ab1 100644 (file)
--- a/watch-control/src/control.c
+++ b/watch-control/src/control.c
@@ -311,21 +311,16 @@ API int watch_manager_get_app_control(const char *app_id, app_control_h *app_con
 
        app_control_set_operation(*app_control, APP_CONTROL_OPERATION_MAIN);
 
-       if (__toolkit == NULL ||
-                       (__watch_appid != NULL &&
-                       strcmp(__watch_appid, app_id) != 0)) {
-
-               _D("cur %s, new %s", __watch_appid, app_id);
-               if (screen_connector_toolkit_is_exist((char *)__watch_appid,
-                               SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH))
-                       screen_connector_toolkit_evas_remove(__toolkit);
-               ops.added_cb = __screen_connector_toolkit_evas_added_cb;
-               ops.removed_cb = __screen_connector_toolkit_evas_removed_cb;
-               ops.updated_cb = __screen_connector_toolkit_evas_updated_cb;
-               __toolkit = screen_connector_toolkit_evas_add(&ops,
-                               (char *)app_id,
-                               SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH, NULL);
-       }
+       _D("cur %s, new %s", __watch_appid, app_id);
+       if (screen_connector_toolkit_is_exist((char *)__watch_appid,
+                       SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH))
+               screen_connector_toolkit_evas_remove(__toolkit);
+       ops.added_cb = __screen_connector_toolkit_evas_added_cb;
+       ops.removed_cb = __screen_connector_toolkit_evas_removed_cb;
+       ops.updated_cb = __screen_connector_toolkit_evas_updated_cb;
+       __toolkit = screen_connector_toolkit_evas_add(&ops,
+                       (char *)app_id,
+                       SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH, NULL);
 
        app_control_to_bundle(*app_control, &b);
        if (b) {