From 6960c436132e82dacc0b6d4659deabe26109fd98 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 15 Jan 2016 10:53:46 -0800
Subject: [PATCH] Initial map position incorrect

---
 src/FlightDisplay/FlightDisplayViewMap.qml | 2 +-
 src/MissionEditor/MissionEditor.qml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 8940b3e70..f3621a37f 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -45,7 +45,7 @@ FlightMap {
     property var    activeVehicleCoordinate:        multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.coordinate : QtPositioning.coordinate()
 
     onActiveVehicleCoordinateChanged: {
-        if (_followVehicle && activeVehicleCoordinate.isValid) {
+        if (_followVehicle && _activeVehicleCoordinateValid && activeVehicleCoordinate.isValid) {
             _initialMapPositionSet = true
             flightMap.center  = activeVehicleCoordinate
         }
diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 41cd0fbad..2cef859b1 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -85,7 +85,7 @@ QGCView {
     }
 
     function updateMapToVehiclePosition() {
-        if (_activeVehicle && _activeVehicle.coordinateValid && _firstVehiclePosition) {
+        if (_activeVehicle && _activeVehicle.coordinateValid && _activeVehicle.coordinate.isValid && _firstVehiclePosition) {
             _firstVehiclePosition = false
             editorMap.center = _activeVehicle.coordinate
         }
-- 
2.22.0