From bc09a872fa00674704dbc0204adc55cfc63b0d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Mon, 21 Oct 2019 12:12:36 +0200
Subject: [PATCH] mixer_module: do not enter test mode if kill switch is
 engaged

---
 src/lib/mixer_module/mixer_module.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/mixer_module/mixer_module.cpp b/src/lib/mixer_module/mixer_module.cpp
index 2489273481..58735c7e06 100644
--- a/src/lib/mixer_module/mixer_module.cpp
+++ b/src/lib/mixer_module/mixer_module.cpp
@@ -316,7 +316,7 @@ bool MixingOutput::update()
 	}
 
 	// check for motor test
-	if (!_armed.armed) {
+	if (!_armed.armed && !_armed.manual_lockdown) {
 		unsigned num_motor_test = motorTest();
 
 		if (num_motor_test > 0) {