From cfe4ec4d1f038a75bf79ed0459d6cd7472193e47 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 6 Aug 2019 12:33:36 +1000 Subject: [PATCH] Plane: add nullptr check for mavlink channel 0 --- ArduPlane/system.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp index 7f2e243aaf..2a36f592b8 100644 --- a/ArduPlane/system.cpp +++ b/ArduPlane/system.cpp @@ -342,6 +342,7 @@ void Plane::check_long_failsafe() (tnow - failsafe.last_heartbeat_ms) > g.fs_timeout_long*1000) { failsafe_long_on_event(FAILSAFE_GCS, MODE_REASON_GCS_FAILSAFE); } else if (g.gcs_heartbeat_fs_enabled == GCS_FAILSAFE_HB_RSSI && + gcs().chan(0) != nullptr && gcs().chan(0)->last_radio_status_remrssi_ms != 0 && (tnow - gcs().chan(0)->last_radio_status_remrssi_ms) > g.fs_timeout_long*1000) { failsafe_long_on_event(FAILSAFE_GCS, MODE_REASON_GCS_FAILSAFE);