From f0f46a77d75d8c9eda9b6afa491e8c8bad190991 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 6 Aug 2014 22:13:37 +1000 Subject: [PATCH] AP_Terrain: don't request data at 0/0 --- libraries/AP_Terrain/TerrainMission.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Terrain/TerrainMission.cpp b/libraries/AP_Terrain/TerrainMission.cpp index 7300ef28f0..45e851de3b 100644 --- a/libraries/AP_Terrain/TerrainMission.cpp +++ b/libraries/AP_Terrain/TerrainMission.cpp @@ -65,8 +65,9 @@ void AP_Terrain::update_mission_data(void) // we only want nav waypoint commands. That should be enough to // prefill the terrain data and makes many things much simpler - while (cmd.id != MAV_CMD_NAV_WAYPOINT && - cmd.id != MAV_CMD_NAV_SPLINE_WAYPOINT) { + while ((cmd.id != MAV_CMD_NAV_WAYPOINT && + cmd.id != MAV_CMD_NAV_SPLINE_WAYPOINT) || + (cmd.content.location.lat == 0 && cmd.content.location.lng == 0)) { next_mission_index++; if (!mission.read_cmd_from_storage(next_mission_index, cmd)) { // nothing more to do