Browse Source

AirspaceManager: Remove pointer check before delete

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 5 years ago
parent
commit
2be698fdc4
  1. 25
      src/AirspaceManagement/AirspaceManager.cc

25
src/AirspaceManagement/AirspaceManager.cc

@ -48,21 +48,16 @@ AirspaceManager::AirspaceManager(QGCApplication* app, QGCToolbox* toolbox)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
AirspaceManager::~AirspaceManager() AirspaceManager::~AirspaceManager()
{ {
if(_advisories) { delete _advisories;
delete _advisories; _advisories = nullptr;
} delete _weatherProvider;
if(_weatherProvider) { _weatherProvider = nullptr;
delete _weatherProvider; delete _ruleSetsProvider;
} _ruleSetsProvider = nullptr;
if(_ruleSetsProvider) { delete _airspaces;
delete _ruleSetsProvider; _airspaces = nullptr;
} delete _flightPlan;
if(_airspaces) { _flightPlan = nullptr;
delete _airspaces;
}
if(_flightPlan) {
delete _flightPlan;
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

Loading…
Cancel
Save