Browse Source

MAVLinkLogManager: Remove pointer check before delete

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 5 years ago
parent
commit
642b1b822f
  1. 10
      src/Vehicle/MAVLinkLogManager.cc

10
src/Vehicle/MAVLinkLogManager.cc

@ -688,9 +688,8 @@ MAVLinkLogManager::_sendLog(const QString& logFile) @@ -688,9 +688,8 @@ MAVLinkLogManager::_sendLog(const QString& logFile)
}
QFile* file = new QFile(logFile);
if(!file || !file->open(QIODevice::ReadOnly)) {
if(file) {
delete file;
}
delete file;
file = nullptr;
qCWarning(MAVLinkLogManagerLog) << "Could not open log file:" << logFile;
return false;
}
@ -929,10 +928,7 @@ MAVLinkLogManager::_discardLog() @@ -929,10 +928,7 @@ MAVLinkLogManager::_discardLog()
bool
MAVLinkLogManager::_createNewLog()
{
if(_logProcessor) {
delete _logProcessor;
_logProcessor = nullptr;
}
delete _logProcessor;
_logProcessor = new MAVLinkLogProcessor;
if(_logProcessor->create(this, _logPath, static_cast<uint8_t>(_vehicle->id()))) {
_insertNewLog(_logProcessor->record());

Loading…
Cancel
Save