From 435ef38edaf95e49b40a40fca5aebcdbeb3e03ef Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lorenz@px4.io>
Date: Sat, 20 Mar 2021 07:55:39 +0100
Subject: [PATCH] RC Input: Reset lock state when switching to a new protocol

---
 src/drivers/rc_input/RCInput.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drivers/rc_input/RCInput.cpp b/src/drivers/rc_input/RCInput.cpp
index f08d3173f6..de51ee5639 100644
--- a/src/drivers/rc_input/RCInput.cpp
+++ b/src/drivers/rc_input/RCInput.cpp
@@ -245,6 +245,7 @@ void RCInput::set_rc_scan_state(RC_SCAN newState)
 	PX4_DEBUG("RCscan: %s failed, trying %s", RCInput::RC_SCAN_STRING[_rc_scan_state], RCInput::RC_SCAN_STRING[newState]);
 	_rc_scan_begin = 0;
 	_rc_scan_state = newState;
+	_rc_scan_locked = false;
 }
 
 void RCInput::rc_io_invert(bool invert)