From 22e4e85eeb1d2688a05f5b74cfbf936539264b1e Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Wed, 4 Dec 2019 16:20:26 -0500
Subject: [PATCH] collision_prevention: don't unadvertise mavlink_log in
 destructor

---
 src/lib/collision_prevention/CollisionPrevention.cpp | 8 --------
 src/lib/collision_prevention/CollisionPrevention.hpp | 5 ++---
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/lib/collision_prevention/CollisionPrevention.cpp b/src/lib/collision_prevention/CollisionPrevention.cpp
index 0c2b47bf54..70729202ba 100644
--- a/src/lib/collision_prevention/CollisionPrevention.cpp
+++ b/src/lib/collision_prevention/CollisionPrevention.cpp
@@ -87,14 +87,6 @@ CollisionPrevention::CollisionPrevention(ModuleParams *parent) :
 	}
 }
 
-CollisionPrevention::~CollisionPrevention()
-{
-	//unadvertise publishers
-	if (_mavlink_log_pub != nullptr) {
-		orb_unadvertise(_mavlink_log_pub);
-	}
-}
-
 hrt_abstime CollisionPrevention::getTime()
 {
 	return hrt_absolute_time();
diff --git a/src/lib/collision_prevention/CollisionPrevention.hpp b/src/lib/collision_prevention/CollisionPrevention.hpp
index 44713a622e..aac78e1c24 100644
--- a/src/lib/collision_prevention/CollisionPrevention.hpp
+++ b/src/lib/collision_prevention/CollisionPrevention.hpp
@@ -65,11 +65,10 @@ class CollisionPrevention : public ModuleParams
 {
 public:
 	CollisionPrevention(ModuleParams *parent);
-
-	virtual ~CollisionPrevention();
+	~CollisionPrevention() override = default;
 
 	/**
-	 * Returs true if Collision Prevention is running
+	 * Returns true if Collision Prevention is running
 	 */
 	bool is_active();