From 16b880234bd55e45433e886045da8334f73f1a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Wed, 6 May 2015 21:11:58 +0300 Subject: [PATCH] Fixed|Time|libcore: Missing conversion of Time to text Previously it was only possible to convert a high-performance time to text using the BuildNumberAndSecondsSinceStart format. --- doomsday/sdk/libcore/src/data/time.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/doomsday/sdk/libcore/src/data/time.cpp b/doomsday/sdk/libcore/src/data/time.cpp index a0425e1490..6977a53526 100644 --- a/doomsday/sdk/libcore/src/data/time.cpp +++ b/doomsday/sdk/libcore/src/data/time.cpp @@ -313,11 +313,17 @@ String Time::asText(Format format) const } else if(format == BuildNumberAndSecondsSinceStart) { - DENG2_ASSERT(d->flags & Instance::HighPerformance); - - TimeDelta const elapsed = d->highPerfElapsed; + TimeDelta elapsed; + if(d->flags.testFlag(Instance::HighPerformance)) + { + elapsed = d->highPerfElapsed; + } + else if(d->flags.testFlag(Instance::DateTime)) + { + elapsed = highPerfTimer.startedAt().deltaTo(Time(d->dateTime)); + } int hours = elapsed.asHours(); - double sec = elapsed - hours * 3600.0; + TimeDelta sec = elapsed - hours * 3600.0; if(hours > 0) { return QString("#%1 %2h%3")