From 857b48d57d3c67451ee1133ca99428941194ce21 Mon Sep 17 00:00:00 2001
From: Nick <145654544+ttechnick@users.noreply.github.com>
Date: Fri, 30 Jan 2026 09:35:49 +0100
Subject: [PATCH] [1.17] Bugfix: Prevent Offboard to Position without RC
 (#26391)

---
 src/modules/commander/failsafe/failsafe.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/modules/commander/failsafe/failsafe.cpp b/src/modules/commander/failsafe/failsafe.cpp
index e366e12947..6a61d65ed2 100644
--- a/src/modules/commander/failsafe/failsafe.cpp
+++ b/src/modules/commander/failsafe/failsafe.cpp
@@ -669,6 +669,15 @@ FailsafeBase::Action Failsafe::checkModeFallback(const failsafe_flags_s &status_
 		if (action == Action::Disarm) {
 			return action;
 		}
+
+		if (action == Action::FallbackPosCtrl || action == Action::FallbackAltCtrl || action == Action::FallbackStab) {
+			// Check if RC is available, if not use the mode specified in NAV_RCL_ACT
+			if (status_flags.manual_control_signal_lost) {
+				ActionOptions rc_loss_action = fromNavDllOrRclActParam(_param_nav_rcl_act.get());
+				action = rc_loss_action.action;
+			}
+
+		}
 	}
 
 	// PosCtrl/PositionSlow -> AltCtrl