From 12d29fd093e3e988308d0b7b027d7a45eeaf5b5c Mon Sep 17 00:00:00 2001 From: TSC21 Date: Wed, 27 Feb 2019 11:54:51 +0000 Subject: [PATCH] navigator: mission_feasibility_checker: remove lazy comparison --- src/modules/navigator/mission_feasibility_checker.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/navigator/mission_feasibility_checker.cpp b/src/modules/navigator/mission_feasibility_checker.cpp index 544e5e8a78..f4f084321c 100644 --- a/src/modules/navigator/mission_feasibility_checker.cpp +++ b/src/modules/navigator/mission_feasibility_checker.cpp @@ -106,11 +106,12 @@ MissionFeasibilityChecker::checkRotarywing(const mission_s &mission, float home_ bool MissionFeasibilityChecker::checkFixedwing(const mission_s &mission, float home_alt, bool land_start_req) { - /* - * Perform checks and issue feedback to the user for all checks - * Mission is only marked as feasible if all checks return true - */ - return (checkTakeoff(mission, home_alt) && checkFixedWingLanding(mission, land_start_req)); + /* Perform checks and issue feedback to the user for all checks */ + bool resTakeoff = checkTakeoff(mission, home_alt); + bool resLanding = checkFixedWingLanding(mission, land_start_req); + + /* Mission is only marked as feasible if all checks return true */ + return (resTakeoff && resLanding); } bool