diff --git a/rcl_action/src/rcl_action/action_server.c b/rcl_action/src/rcl_action/action_server.c index 626101e2f..61cbd0ff2 100644 --- a/rcl_action/src/rcl_action/action_server.c +++ b/rcl_action/src/rcl_action/action_server.c @@ -170,10 +170,13 @@ rcl_action_server_init( PUBLISHER_INIT(feedback); PUBLISHER_INIT(status); - // Initialize Timer + // Copy clock + action_server->impl->clock = *clock; + +// Initialize Timer ret = rcl_timer_init( - &action_server->impl->expire_timer, clock, node->context, options->result_timeout.nanoseconds, - NULL, allocator); + &action_server->impl->expire_timer, &action_server->impl->clock, node->context, + options->result_timeout.nanoseconds, NULL, allocator); if (RCL_RET_OK != ret) { goto fail; } @@ -183,9 +186,6 @@ rcl_action_server_init( goto fail; } - // Copy clock - action_server->impl->clock = *clock; - // Copy action name action_server->impl->action_name = rcutils_strdup(action_name, allocator); if (NULL == action_server->impl->action_name) {