Skip to content

Q
qgroundcontrol
Commit 98c2f5d9 authored by Patrick José Pereira's avatar Patrick José Pereira
Browse files
Options

QGCCameraControl: Remove pointer check before delete 

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent e354232b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
src/Camera/QGCCameraControl.cc
View file @ 98c2f5d9
...@@ -189,9 +189,8 @@ QGCCameraControl::QGCCameraControl(const mavlink_camera_information_t *info, Veh ...@@ -189,9 +189,8 @@ QGCCameraControl::QGCCameraControl(const mavlink_camera_information_t *info, Veh
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QGCCameraControl::~QGCCameraControl() QGCCameraControl::~QGCCameraControl()
{ {
if(_netManager) { delete _netManager;
delete _netManager; _netManager = nullptr;
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -217,10 +216,9 @@ QGCCameraControl::_initWhenReady() ...@@ -217,10 +216,9 @@ QGCCameraControl::_initWhenReady()
QTimer::singleShot(2500, this, &QGCCameraControl::_requestStorageInfo); QTimer::singleShot(2500, this, &QGCCameraControl::_requestStorageInfo);
_captureStatusTimer.start(2750); _captureStatusTimer.start(2750);
emit infoChanged(); emit infoChanged();
if(_netManager) {
delete _netManager; delete _netManager;
_netManager = nullptr; _netManager = nullptr;
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment