Merge pull request #8341 from dakejahl/pr-fix_preflight_battery_check

Fix PreFlightBatteryCheck issue with NaN

Merge pull request #8341 from dakejahl/pr-fix_preflight_battery_check
Fix PreFlightBatteryCheck issue with NaN
bd4bfe55 · Don Gagne · GitHub · 4bf97b5e · e4a4c33b · bd4bfe55
Unverified Commit bd4bfe55 authored Feb 18, 2020 by Don Gagne Committed by GitHub Feb 18, 2020
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

PreFlightBatteryCheck.qml src/FlightDisplay/PreFlightBatteryCheck.qml +2 -1

No files found.
--- a/src/FlightDisplay/PreFlightBatteryCheck.qml
+++ b/src/FlightDisplay/PreFlightBatteryCheck.qml
@@ -25,6 +25,7 @@ PreFlightCheckButton {

    property int    failurePercent:                 40
    property bool   allowFailurePercentOverride:    false
-    property var    _batPercentRemaining:           activeVehicle ? activeVehicle.battery.percentRemaining.value : 0
+    property var    _batteryValue:                  activeVehicle ? activeVehicle.battery.percentRemaining.value : 0
+    property var    _batPercentRemaining:           isNaN(_batteryValue) ? 0 : _batteryValue
    property bool   _batLow:                        _batPercentRemaining < failurePercent
 }