summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-ui/models.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index d6b425b52..69a276bfb 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -1372,15 +1372,19 @@ QString DiveItem::displayDepthWithUnit() const
QString DiveItem::displayDuration() const
{
- int hrs, mins;
+ int hrs, mins, fullmins, secs;
struct dive *dive = get_dive_by_uniq_id(diveId);
mins = (dive->duration.seconds + 59) / 60;
+ fullmins = dive->duration.seconds / 60;
+ secs = dive->duration.seconds - 60 * fullmins;
hrs = mins / 60;
mins -= hrs * 60;
QString displayTime;
if (hrs)
displayTime = QString("%1:%2").arg(hrs).arg(mins, 2, 10, QChar('0'));
+ else if (mins < 15 || dive->dc.divemode == FREEDIVE)
+ displayTime = QString("%1m%2s").arg(fullmins).arg(secs, 2, 10, QChar('0'));
else
displayTime = QString("%1").arg(mins);
return displayTime;