1 files changed, 11 insertions, 6 deletions

diff --git a/battery b/battery
index d2d4ba5..c47e61d 100755
--- a/battery
+++ b/battery
@@ -64,12 +64,17 @@ sub update {
     my $percentage=sprintf '%.0f%%', 100*$fraction;
 
     if ($deriv) {
-        my $t=( $charging ? $full - $now : $now )/$deriv;
-        my $tot=$full/$deriv;
-
-        $time_estimate = sprintf "%s/%s",
-            _format_time($t),
-            _format_time($tot);
+        if ($charging) {
+            $time_estimate = _format_time(($full-$now)/$deriv);
+        }
+        else {
+            my $t=$now/$deriv;
+            my $tot=$full/$deriv;
+
+            $time_estimate = sprintf "%s/%s",
+                _format_time($t),
+                _format_time($tot);
+        }
     }
 
     if ($charging) {