summaryrefslogtreecommitdiff
path: root/src/lib/util.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-29 16:46:30 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-29 16:46:30 +0100
commita07b5d79f2ac072d550ccb5587fe527c5340e248 (patch)
tree0639697a62bb23b4effa8a5e4b7bbfab57629a9e /src/lib/util.cc
parentf80d8d37323394113d6491e1cae271e32b2de5b4 (diff)
Small tweaks to times in progress reports.
Diffstat (limited to 'src/lib/util.cc')
-rw-r--r--src/lib/util.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc
index bb74c168d..f3795c264 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -139,8 +139,8 @@ seconds_to_approximate_hms (int s)
SafeStringStream ap;
bool const hours = h > 0;
- bool const minutes = h < 10 && m > 0;
- bool const seconds = m < 10 && s > 0;
+ bool const minutes = h < 6 && m > 0;
+ bool const seconds = h == 0 && m < 10 && s > 0;
if (hours) {
if (m > 30 && !minutes) {
@@ -151,7 +151,7 @@ seconds_to_approximate_hms (int s)
ap << h << _("h");
}
- if (minutes | seconds) {
+ if (minutes || seconds) {
ap << N_(" ");
}
}