Merge pull request #35 from EgorMatirov/master

Show percentage of battery if timeToEmpty is 0.
papyros · Feb 5, 2015 · d847915 · d847915
2 parents 0dafe4f + a76b8b4
commit d847915
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/qml/backend/UPower.qml b/qml/backend/UPower.qml
@@ -75,7 +75,7 @@ UPowerConnection {
 
         if (device.state == UPowerDeviceState.Charging) {
             return "%1 until full".arg(DateUtils.shortDuration(device.timeToFull * 1000, 'm'))
-        } else if (device.state == UPowerDeviceState.Discharging) {
+        } else if (device.state == UPowerDeviceState.Discharging && device.timeToEmpty != 0) {
             return "%1 remaining".arg(DateUtils.shortDuration(device.timeToEmpty * 1000, 'm'))
         } else if (device.state == UPowerDeviceState.FullyCharged) {
             return "Fully Charged"