Skip to content

Q
qgroundcontrol
Commit f0f739f3 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Fixing a crash bug where a leaving vehicle was not being properly cleaned up.

parent e35cf4c8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
src/ViewWidgets/LogDownloadController.cc
View file @ f0f739f3
...@@ -129,19 +129,18 @@ LogDownloadController::_processDownload() ...@@ -129,19 +129,18 @@ LogDownloadController::_processDownload()
void void
LogDownloadController::_setActiveVehicle(Vehicle* vehicle) LogDownloadController::_setActiveVehicle(Vehicle* vehicle)
{ {
if((_uas && vehicle && _uas == vehicle->uas()) || !vehicle ) { if(_uas) {
return;
}
_vehicle = vehicle;
if (_uas) {
_logEntriesModel.clear(); _logEntriesModel.clear();
disconnect(_uas, &UASInterface::logEntry, this, &LogDownloadController::_logEntry); disconnect(_uas, &UASInterface::logEntry, this, &LogDownloadController::_logEntry);
disconnect(_uas, &UASInterface::logData, this, &LogDownloadController::_logData); disconnect(_uas, &UASInterface::logData, this, &LogDownloadController::_logData);
_uas = NULL; _uas = NULL;
} }
_uas = vehicle->uas(); _vehicle = vehicle;
connect(_uas, &UASInterface::logEntry, this, &LogDownloadController::_logEntry); if(_vehicle) {
connect(_uas, &UASInterface::logData, this, &LogDownloadController::_logData); _uas = vehicle->uas();
connect(_uas, &UASInterface::logEntry, this, &LogDownloadController::_logEntry);
connect(_uas, &UASInterface::logData, this, &LogDownloadController::_logData);
}
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
......
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