From c9658f28e9fc9f50e48c32f23ecf9d9200b08949 Mon Sep 17 00:00:00 2001 From: Mahima Yoga Date: Tue, 10 Jun 2025 04:17:13 +0200 Subject: [PATCH] commander: use existing class state to track mission progress (#24947) Replaced the local variable landed_amid_mission with the class member _mission_in_progress for consistency and to reduce redundancy. No functional change. --- src/modules/commander/Commander.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp index ad5eccafb4..0e183f4ff9 100644 --- a/src/modules/commander/Commander.cpp +++ b/src/modules/commander/Commander.cpp @@ -2255,9 +2255,7 @@ void Commander::handleAutoDisarm() // Check for auto-disarm on landing or pre-flight if (_param_com_disarm_land.get() > 0 || _param_com_disarm_prflt.get() > 0) { - const bool landed_amid_mission = (_vehicle_status.nav_state == vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION) - && !_mission_result_sub.get().finished; - const bool auto_disarm_land_enabled = _param_com_disarm_land.get() > 0 && !landed_amid_mission + const bool auto_disarm_land_enabled = _param_com_disarm_land.get() > 0 && !_mission_in_progress && !_config_overrides.disable_auto_disarm; if (auto_disarm_land_enabled && _have_taken_off_since_arming) {