Tweak duration_to_string formatting

diff --git a/src/util/string.h b/src/util/string.h
index d4afcaec82b68c6b046509ab5f95b5eddd97445b..21f1d6877baf4d863bb4be5ade23188e54bc3dcd 100644 (file)
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -670,15 +670,19 @@ inline const std::string duration_to_string(int sec)
 
        std::stringstream ss;
        if (hour > 0) {
-               ss << hour << "h ";
+               ss << hour << "h";
+               if (min > 0 || sec > 0)
+                       ss << " ";
        }
 
        if (min > 0) {
-               ss << min << "m ";
+               ss << min << "min";
+               if (sec > 0)
+                       ss << " ";
        }
 
        if (sec > 0) {
-               ss << sec << "s ";
+               ss << sec << "s";
        }
 
        return ss.str();