From c03f5b94818432b1fcc81c4a351c8ce722b60996 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Wed, 25 May 2022 17:41:56 +0200 Subject: [PATCH] Commander: fix overlooked rebase naming error --- src/modules/commander/Commander.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp index f3f881c374..0d5c697d27 100644 --- a/src/modules/commander/Commander.cpp +++ b/src/modules/commander/Commander.cpp @@ -2402,7 +2402,7 @@ Commander::run() // Check for auto-disarm on landing or pre-flight if (_param_com_disarm_land.get() > 0 || _param_com_disarm_preflight.get() > 0) { - const bool landed_amid_mission = (_status.nav_state == vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION) + const bool landed_amid_mission = (_vehicle_status.nav_state == vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION) && !_mission_result_sub.get().finished; if (_param_com_disarm_land.get() > 0 && _have_taken_off_since_arming && !landed_amid_mission) {