From b6551cf064c7eeecc286061ee10d5d3e5c3eabbf Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Sun, 19 Apr 2015 11:33:00 -0400
Subject: [PATCH] Reset heartbeat timeout on new connection.

---
 src/ui/toolbar/MainToolBar.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ui/toolbar/MainToolBar.cc b/src/ui/toolbar/MainToolBar.cc
index 560c664e9..c7c6a2bf7 100644
--- a/src/ui/toolbar/MainToolBar.cc
+++ b/src/ui/toolbar/MainToolBar.cc
@@ -334,6 +334,9 @@ void MainToolBar::_setActiveUAS(UASInterface* active)
         QGCUASParamManagerInterface* paramMgr = _mav->getParamManager();
         Q_ASSERT(paramMgr);
         connect(paramMgr, SIGNAL(parameterListProgress(float)),              this, SLOT(_setProgressBarValue(float)));
+        // Reset connection lost (if any)
+        _currentHeartbeatTimeout = 0;
+        emit heartbeatTimeoutChanged(_currentHeartbeatTimeout);
     }
     // Let toolbar know about it
     emit mavPresentChanged(_mav != NULL);
-- 
2.22.0