From 9bcd1a41fba21549cf053cdb58f15c38d5d98d4e Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 1 Mar 2017 11:02:16 -0800
Subject: [PATCH] Consider any message from vehicle comm lost restart

---
 src/Vehicle/Vehicle.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index c2d265162..2ba2fc255 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -493,6 +493,10 @@ void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t mes
         }
     }
 
+
+    // Mark this vehicle as active
+    _connectionActive();
+
     // Give the plugin a change to adjust the message contents
     if (!_firmwarePlugin->adjustIncomingMavlinkMessage(this, &message)) {
         return;
@@ -900,8 +904,6 @@ void Vehicle::_handleHeartbeat(mavlink_message_t& message)
         return;
     }
 
-    _connectionActive();
-
     mavlink_heartbeat_t heartbeat;
 
     mavlink_msg_heartbeat_decode(&message, &heartbeat);
-- 
2.22.0