From 01896c98d1d9c413802a71ece5d612ac78458c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Wed, 5 Feb 2020 17:28:18 -0300
Subject: [PATCH] VideoManager: Remove pointer check before delete
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
src/FlightDisplay/VideoManager.cc | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/FlightDisplay/VideoManager.cc b/src/FlightDisplay/VideoManager.cc
index 8be76469e6..92820a26f8 100644
--- a/src/FlightDisplay/VideoManager.cc
+++ b/src/FlightDisplay/VideoManager.cc
@@ -39,12 +39,10 @@ VideoManager::VideoManager(QGCApplication* app, QGCToolbox* toolbox)
//-----------------------------------------------------------------------------
VideoManager::~VideoManager()
{
- if(_videoReceiver) {
- delete _videoReceiver;
- }
- if(_thermalVideoReceiver) {
- delete _thermalVideoReceiver;
- }
+ delete _videoReceiver;
+ _videoReceiver = nullptr;
+ delete _thermalVideoReceiver;
+ _thermalVideoReceiver = nullptr;
}
//-----------------------------------------------------------------------------
--
GitLab