efl_animation: Fix incorrect logic in group animation

2 files changed, 18 insertions, 24 deletions

diff --git a/src/lib/evas/canvas/efl_animation_group_parallel.c b/src/lib/evas/canvas/efl_animation_group_parallel.c
index 551de0b43a..5f9692c08c 100644
--- a/src/lib/evas/canvas/efl_animation_group_parallel.c
+++ b/src/lib/evas/canvas/efl_animation_group_parallel.c
@@ -57,18 +57,6 @@ _efl_animation_group_parallel_efl_animation_instance_create(Eo *eo_obj, Evas_Obj
 {
    EFL_ANIMATION_GROUP_PARALLEL_CHECK_OR_RETURN(eo_obj, NULL);
 
-   Efl_Animation_Instance_Group_Parallel *instance
-      = efl_add(EFL_ANIMATION_INSTANCE_GROUP_PARALLEL_CLASS, NULL);
-
-   Eo *target = efl_animation_target_get(eo_obj);
-   efl_animation_instance_target_set(instance, target);
-
-   Eina_Bool state_keep = efl_animation_final_state_keep_get(eo_obj);
-   efl_animation_instance_final_state_keep_set(instance, state_keep);
-
-   double duration = efl_animation_duration_get(eo_obj);
-   efl_animation_instance_duration_set(instance, duration);
-
    Efl_Animation_Instance_Group_Parallel *group_inst
       = efl_add(EFL_ANIMATION_INSTANCE_GROUP_PARALLEL_CLASS, NULL);
 
@@ -83,6 +71,15 @@ _efl_animation_group_parallel_efl_animation_instance_create(Eo *eo_obj, Evas_Obj
         efl_animation_instance_group_instance_add(group_inst, child_inst);
      }
 
+   Eo *target = efl_animation_target_get(eo_obj);
+   efl_animation_instance_target_set(group_inst, target);
+
+   Eina_Bool state_keep = efl_animation_final_state_keep_get(eo_obj);
+   efl_animation_instance_final_state_keep_set(group_inst, state_keep);
+
+   double duration = efl_animation_duration_get(eo_obj);
+   efl_animation_instance_duration_set(group_inst, duration);
+
    return group_inst;
 }
 
diff --git a/src/lib/evas/canvas/efl_animation_group_sequential.c b/src/lib/evas/canvas/efl_animation_group_sequential.c
index f78f300b06..f3f350a2d1 100644
--- a/src/lib/evas/canvas/efl_animation_group_sequential.c
+++ b/src/lib/evas/canvas/efl_animation_group_sequential.c
@@ -57,18 +57,6 @@ _efl_animation_group_sequential_efl_animation_instance_create(Eo *eo_obj, Evas_O
 {
    EFL_ANIMATION_GROUP_SEQUENTIAL_CHECK_OR_RETURN(eo_obj, NULL);
 
-   Efl_Animation_Instance_Group_Sequential *instance
-      = efl_add(EFL_ANIMATION_INSTANCE_GROUP_SEQUENTIAL_CLASS, NULL);
-
-   Eo *target = efl_animation_target_get(eo_obj);
-   efl_animation_instance_target_set(instance, target);
-
-   Eina_Bool state_keep = efl_animation_final_state_keep_get(eo_obj);
-   efl_animation_instance_final_state_keep_set(instance, state_keep);
-
-   double duration = efl_animation_duration_get(eo_obj);
-   efl_animation_instance_duration_set(instance, duration);
-
    Efl_Animation_Instance_Group_Sequential *group_inst
       = efl_add(EFL_ANIMATION_INSTANCE_GROUP_SEQUENTIAL_CLASS, NULL);
 
@@ -83,6 +71,15 @@ _efl_animation_group_sequential_efl_animation_instance_create(Eo *eo_obj, Evas_O
         efl_animation_instance_group_instance_add(group_inst, child_inst);
      }
 
+   Eo *target = efl_animation_target_get(eo_obj);
+   efl_animation_instance_target_set(group_inst, target);
+
+   Eina_Bool state_keep = efl_animation_final_state_keep_get(eo_obj);
+   efl_animation_instance_final_state_keep_set(group_inst, state_keep);
+
+   double duration = efl_animation_duration_get(eo_obj);
+   efl_animation_instance_duration_set(group_inst, duration);
+
    return group_inst;
 }