Skip to content

Q
qgroundcontrol
Commit 5fe4a4a5 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent da8e98a1
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
src/FirmwarePlugin/FirmwarePlugin.cc
View file @ 5fe4a4a5
...@@ -717,9 +717,7 @@ void FirmwarePlugin::_versionFileDownloadFinished(QString& remoteFile, QString& ...@@ -717,9 +717,7 @@ void FirmwarePlugin::_versionFileDownloadFinished(QString& remoteFile, QString&
int currType = vehicle->firmwareVersionType(); int currType = vehicle->firmwareVersionType();
// Check if lower version than stable or same version but different type // Check if lower version than stable or same version but different type
if (vehicle->versionCompare(version) < 0 if (currType == FIRMWARE_VERSION_TYPE_OFFICIAL && vehicle->versionCompare(version) < 0) {
|| (vehicle->versionCompare(version) == 0 && currType != FIRMWARE_VERSION_TYPE_OFFICIAL))
{
const static QString currentVersion = QString("%1.%2.%3").arg(vehicle->firmwareMajorVersion()) const static QString currentVersion = QString("%1.%2.%3").arg(vehicle->firmwareMajorVersion())
.arg(vehicle->firmwareMinorVersion()) .arg(vehicle->firmwareMinorVersion())
.arg(vehicle->firmwarePatchVersion()); .arg(vehicle->firmwarePatchVersion());
......
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