diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2012-11-07 00:33:38 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2012-11-07 00:33:38 +0000 |
| commit | 534eafd445f6a52d63a0dea5caedfcb8e76463c7 (patch) | |
| tree | 4340ce45fa548e7a77652b92a426866bc21b9457 /lib/common/Timer.cpp | |
| parent | 5d544781782335220b75c79a5e886ed4bd181940 (diff) | |
Fix incorrect logging of timer assignment, and format expiry time as a human time.
Diffstat (limited to 'lib/common/Timer.cpp')
| -rw-r--r-- | lib/common/Timer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp index 24a4568d..238860d6 100644 --- a/lib/common/Timer.cpp +++ b/lib/common/Timer.cpp @@ -482,13 +482,13 @@ Timer::~Timer() void Timer::LogAssignment(const Timer &From) { #ifndef BOX_RELEASE_BUILD - if (mExpired) + if (From.mExpired) { BOX_TRACE(TIMER_ID "initialised from timer " << TIMER_ID_OF(From) << ", already expired, " "will not fire"); } - else if (mExpires == 0) + else if (From.mExpires == 0) { BOX_TRACE(TIMER_ID "initialised from timer " << TIMER_ID_OF(From) << ", no expiry, " @@ -497,8 +497,8 @@ void Timer::LogAssignment(const Timer &From) else { BOX_TRACE(TIMER_ID "initialised from timer " << - TIMER_ID_OF(From) << ", to fire after " << - BOX_FORMAT_MICROSECONDS(From.mExpires)); + TIMER_ID_OF(From) << ", to fire at " << + FormatTime(From.mExpires, false, true)); } #endif } |