From 6c69d86d7ea5c307cf988b7a3ec37fd39b7edbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Filipovic=CC=81?= <luka@sunflower-labs.com>
Date: Wed, 24 Sep 2025 13:32:41 +0200
Subject: [PATCH] mission_base: on mission end, set loiter position from
 previous position type setpoint

---
 src/modules/navigator/mission_base.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/navigator/mission_base.cpp b/src/modules/navigator/mission_base.cpp
index d95e0cea15..79fa7aefd9 100644
--- a/src/modules/navigator/mission_base.cpp
+++ b/src/modules/navigator/mission_base.cpp
@@ -556,7 +556,9 @@ void MissionBase::setEndOfMissionItems()
 		_mission_item.nav_cmd = NAV_CMD_IDLE;
 
 	} else {
-		if (pos_sp_triplet->current.valid && pos_sp_triplet->current.type == position_setpoint_s::SETPOINT_TYPE_LOITER) {
+		if (pos_sp_triplet->current.valid &&
+		    (pos_sp_triplet->current.type == position_setpoint_s::SETPOINT_TYPE_LOITER ||
+		     pos_sp_triplet->current.type == position_setpoint_s::SETPOINT_TYPE_POSITION)) {
 			setLoiterItemFromCurrentPositionSetpoint(&_mission_item);
 
 		} else {