Browse Source

fix MavlinkConsoleController: weakLink.expired() logic was inverted (#9259)

And removes the extra expired() call (less atomic ops).
QGC4.4
Beat Küng 4 years ago committed by GitHub
parent
commit
b8a8db61c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/AnalyzeView/MavlinkConsoleController.cc

5
src/AnalyzeView/MavlinkConsoleController.cc

@ -110,11 +110,10 @@ MavlinkConsoleController::_sendSerialData(QByteArray data, bool close) @@ -110,11 +110,10 @@ MavlinkConsoleController::_sendSerialData(QByteArray data, bool close)
return;
}
WeakLinkInterfacePtr weakLink = _vehicle->vehicleLinkManager()->primaryLink();
if (!weakLink.expired()) {
SharedLinkInterfacePtr sharedLink = _vehicle->vehicleLinkManager()->primaryLink().lock();
if (!sharedLink) {
return;
}
SharedLinkInterfacePtr sharedLink = weakLink.lock();
// Send maximum sized chunks until the complete buffer is transmitted
while(data.size()) {

Loading…
Cancel
Save