From 61a66ca85e0ea83ce4eada5b98997d68a690d88e Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Fri, 19 Feb 2021 00:40:24 +1300
Subject: [PATCH] Merge pull request #10559 from
 alexeystn/fix_boxparalyze_disarm

---
 src/main/fc/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/fc/core.c b/src/main/fc/core.c
index b15886ce0c..dcead9a05f 100644
--- a/src/main/fc/core.c
+++ b/src/main/fc/core.c
@@ -935,7 +935,7 @@ bool processRx(timeUs_t currentTimeUs)
         disarmAt = currentTimeUs + autoDisarmDelayUs;  // extend auto-disarm timer
     }
 
-    if (!IS_RC_MODE_ACTIVE(BOXPARALYZE)
+    if (!(IS_RC_MODE_ACTIVE(BOXPARALYZE) && !ARMING_FLAG(ARMED))
 #ifdef USE_CMS
         && !cmsInMenu
 #endif
@@ -956,7 +956,7 @@ bool processRx(timeUs_t currentTimeUs)
     }
 #endif
 
-    if (!cliMode && !IS_RC_MODE_ACTIVE(BOXPARALYZE)) {
+    if (!cliMode && !(IS_RC_MODE_ACTIVE(BOXPARALYZE) && !ARMING_FLAG(ARMED))) {
         processRcAdjustments(currentControlRateProfile);
     }