Merge pull request #7248 from DonLakeFlyer/PriorityLinkInactive

Vehicle: Do not clear priority link if it is the last link

Merge pull request #7248 from DonLakeFlyer/PriorityLinkInactive
Vehicle: Do not clear priority link if it is the last link
77c08818 · Don Gagne · GitHub · 02942885 · bb961d64 · 77c08818
Unverified Commit 77c08818 authored Feb 22, 2019 by Don Gagne Committed by GitHub Feb 22, 2019
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Vehicle.cc src/Vehicle/Vehicle.cc +0 -4

No files found.
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1899,10 +1899,6 @@ void Vehicle::_linkInactiveOrDeleted(LinkInterface* link)

    _links.removeOne(link);

-    if (_priorityLink.data() == link) {
-        _priorityLink.clear();
-    }
-
    _updatePriorityLink(true /* updateActive */, true /* sendCommand */);

    if (_links.count() == 0 && !_allLinksInactiveSent) {