Add check for runcam menu to prevent interfere

Signed-off-by: Mr4th <|\/|>
ArduPilot · Sep 14, 2024 · 497aad5 · 497aad5
1 parent 31356f4
commit 497aad5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libraries/AP_OSD/AP_OSD.cpp b/libraries/AP_OSD/AP_OSD.cpp
@@ -37,6 +37,7 @@
 #include <AP_Terrain/AP_Terrain.h>
 #include <AP_RSSI/AP_RSSI.h>
 #include <GCS_MAVLink/GCS.h>
+#include <AP_Camera/AP_RunCam.h>
 
 // macro for easy use of var_info2
 #define AP_SUBGROUPINFO2(element, name, idx, thisclazz, elclazz) { name, AP_VAROFFSET(thisclazz, element), { group_info : elclazz::var_info2 }, AP_PARAM_FLAG_NESTED_OFFSET, idx, AP_PARAM_GROUP }
@@ -600,7 +601,7 @@ void AP_OSD::update_current_screen()
         }
         break;
     case STICKS_INPUT:
-        if (!AP_Notify::flags.armed) {
+        if (!AP_Notify::flags.armed && !AP::runcam()->is_arming_prevented()) {
             auto &rc_channels = rc();
             auto &roll = rc_channels.get_roll_channel();
             auto &pitch = rc_channels.get_pitch_channel();