From 77c9b93e792b45830f83721c0b1c56ceca92edb1 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 9 Oct 2015 12:22:36 -0700
Subject: [PATCH] Connect MissionManager errors to ui

---
 src/Vehicle/Vehicle.cc | 7 +++++++
 src/Vehicle/Vehicle.h  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 17c308c4f..707d0bfba 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -161,6 +161,7 @@ Vehicle::Vehicle(LinkInterface* link, int vehicleId, MAV_AUTOPILOT firmwareType)
     
     if (qgcApp()->useNewMissionEditor()) {
         _missionManager = new MissionManager(this);
+        connect(_missionManager, &MissionManager::error, this, &Vehicle::_missionManagerError);
     }
     
     _firmwarePlugin->initializeVehicle(this);
@@ -1121,3 +1122,9 @@ void Vehicle::sendMessageMultiple(mavlink_message_t message)
     
     _sendMessageMultipleList.append(info);
 }
+
+void Vehicle::_missionManagerError(int errorCode, const QString& errorMsg)
+{
+    Q_UNUSED(errorCode);
+    qgcApp()->showToolBarMessage(QString("Error during Mission communication with Vehicle: %1").arg(errorMsg));
+}
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 84145e250..44cd75d19 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -333,6 +333,7 @@ private:
     void _startJoystick(bool start);
     void _handleHomePosition(mavlink_message_t& message);
     void _handleHeartbeat(mavlink_message_t& message);
+    void _missionManagerError(int errorCode, const QString& errorMsg);
 
     bool    _isAirplane                     ();
     void    _addChange                      (int id);
-- 
2.22.0