Merge branch 'navigator_rewrite' into navigator_rewrite_estimator

This commit is contained in:
Julian Oes 2014-06-07 17:19:38 +02:00
commit c88f34b129
1 changed files with 1 additions and 2 deletions

View File

@ -90,8 +90,7 @@ RTL::update(struct position_setpoint_triplet_s *pos_sp_triplet)
}
if ((_rtl_state == RTL_STATE_CLIMB
|| _rtl_state == RTL_STATE_RETURN
|| _rtl_state == RTL_STATE_DESCEND)
|| _rtl_state == RTL_STATE_RETURN)
&& is_mission_item_reached()) {
advance_rtl();
set_rtl_item(pos_sp_triplet);