From 2be698fdc44c081477f17714e42c029ac8beadec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Wed, 5 Feb 2020 17:28:18 -0300 Subject: [PATCH] AirspaceManager: 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 --- src/AirspaceManagement/AirspaceManager.cc | 25 +++++++++-------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/AirspaceManagement/AirspaceManager.cc b/src/AirspaceManagement/AirspaceManager.cc index 02714915e..e34d2b8ad 100644 --- a/src/AirspaceManagement/AirspaceManager.cc +++ b/src/AirspaceManagement/AirspaceManager.cc @@ -48,21 +48,16 @@ AirspaceManager::AirspaceManager(QGCApplication* app, QGCToolbox* toolbox) //----------------------------------------------------------------------------- AirspaceManager::~AirspaceManager() { - if(_advisories) { - delete _advisories; - } - if(_weatherProvider) { - delete _weatherProvider; - } - if(_ruleSetsProvider) { - delete _ruleSetsProvider; - } - if(_airspaces) { - delete _airspaces; - } - if(_flightPlan) { - delete _flightPlan; - } + delete _advisories; + _advisories = nullptr; + delete _weatherProvider; + _weatherProvider = nullptr; + delete _ruleSetsProvider; + _ruleSetsProvider = nullptr; + delete _airspaces; + _airspaces = nullptr; + delete _flightPlan; + _flightPlan = nullptr; } //----------------------------------------------------------------------------- -- 2.22.0