From b4960fabcda3a846a0a534604f8c8ca4a4d5b350 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Thu, 5 Apr 2018 21:03:27 -0700
Subject: [PATCH] Fix id screwup causing vehicle creation to break

---
 src/Vehicle/Vehicle.cc | 4 ++--
 src/Vehicle/Vehicle.h  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index c7750dd47..7154e2496 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -797,10 +797,10 @@ void Vehicle::_handleDistanceSensor(mavlink_message_t& message)
 
     if (!_distanceSensorFactGroup.idSet()) {
         _distanceSensorFactGroup.setIdSet(true);
-        _id = distanceSensor.id;
+        _distanceSensorFactGroup.setId(distanceSensor.id);
     }
 
-    if (_id != distanceSensor.id) {
+    if (_distanceSensorFactGroup.id() != distanceSensor.id) {
         // We can only handle a single sensor reporting
         return;
     }
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index fb563a073..4070ac17b 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -71,6 +71,8 @@ public:
 
     bool idSet(void) { return _idSet; }
     void setIdSet(bool idSet) { _idSet = idSet; }
+    uint8_t id(void) { return _id; }
+    void setId(uint8_t id) { _id = id; }
 
     static const char* _rotationNoneFactName;
     static const char* _rotationYaw45FactName;
-- 
2.22.0