From 25282c2989177e777d566096b5b2cb01203486e5 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 28 Aug 2018 12:09:29 +1000 Subject: [PATCH] AP_Mission: rearrange for early-exit if command not found for index --- libraries/AP_Mission/AP_Mission.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/AP_Mission/AP_Mission.cpp b/libraries/AP_Mission/AP_Mission.cpp index 2f3d83a47e..9aa416e3d0 100644 --- a/libraries/AP_Mission/AP_Mission.cpp +++ b/libraries/AP_Mission/AP_Mission.cpp @@ -1554,15 +1554,16 @@ void AP_Mission::advance_current_do_cmd() // find next do command Mission_Command cmd; - if (get_next_do_cmd(cmd_index, cmd)) { - // set current do command and start it - _do_cmd = cmd; - _flags.do_cmd_loaded = true; - start_command(_do_cmd); - }else{ + if (!get_next_do_cmd(cmd_index, cmd)) { // set flag to stop unnecessarily searching for do commands _flags.do_cmd_all_done = true; + return; } + + // set current do command and start it + _do_cmd = cmd; + _flags.do_cmd_loaded = true; + start_command(_do_cmd); } /// get_next_cmd - gets next command found at or after start_index