aboutsummaryrefslogtreecommitdiff
path: root/src/modules/commander/commander.cpp
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-01-18 14:25:24 +0100
committerAnton Babushkin <anton.babushkin@me.com>2014-01-18 14:25:24 +0100
commitb175937b5ffab87e8951c620d7673582341f98b4 (patch)
treeb3c704f19e6276382afdd9289ca018f46f057521 /src/modules/commander/commander.cpp
parent5a1b39a17215103b8f8181d1ba5e44257abc5b34 (diff)
downloadpx4-firmware-b175937b5ffab87e8951c620d7673582341f98b4.tar.gz
px4-firmware-b175937b5ffab87e8951c620d7673582341f98b4.tar.bz2
px4-firmware-b175937b5ffab87e8951c620d7673582341f98b4.zip
navigator, commander: RTL and RC failsafe fixes
Diffstat (limited to 'src/modules/commander/commander.cpp')
-rw-r--r--src/modules/commander/commander.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index cedcbb3fb..6a668fcd7 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -1133,7 +1133,7 @@ int commander_thread_main(int argc, char *argv[])
mavlink_log_critical(mavlink_fd, "#audio: CRITICAL: RC SIGNAL LOST");
status.rc_signal_lost = true;
status_changed = true;
- if (status.main_state != MAIN_STATE_AUTO) {
+ if (status.main_state != MAIN_STATE_AUTO && armed.armed) {
transition_result_t res = main_state_transition(&status, MAIN_STATE_AUTO);
if (res == TRANSITION_CHANGED) {
mavlink_log_critical(mavlink_fd, "#audio: switching to RTL mode");