summaryrefslogtreecommitdiff
path: root/src/core/timer.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-01-10 00:54:46 +0100
committerLennart Poettering <lennart@poettering.net>2013-01-10 00:56:32 +0100
commitb719810db446244ff708a2f5f08566af67ddab61 (patch)
treeceea2415cac3f0f57a42c5c8f84269a6434118b1 /src/core/timer.c
parent28989b63f5e3a959557000f21f3891af08be40f7 (diff)
dbus: properly serialize calendar timer data
As it turns out the bus properties for timer units wre really broken, so let's clean this up for good and properly add calendar timer serialization. We really should get that right before finalizing the bus API documentation in the wiki...
Diffstat (limited to 'src/core/timer.c')
-rw-r--r--src/core/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/timer.c b/src/core/timer.c
index 31ef176e7..4453aa078 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -323,7 +323,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
log_debug_unit(UNIT(t)->id,
"%s: Monotonic timer elapses in %s the next time.",
UNIT(t)->id,
- format_timespan(buf, sizeof(buf), t->next_elapse_monotonic - ts.monotonic));
+ format_timespan(buf, sizeof(buf), t->next_elapse_monotonic > ts.monotonic ? t->next_elapse_monotonic - ts.monotonic : 0));
r = unit_watch_timer(UNIT(t), CLOCK_MONOTONIC, false, t->next_elapse_monotonic, &t->monotonic_watch);
if (r < 0)