diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:37:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:37:33 -0400 |
| commit | f6e7ffdf3fe8e3ed5e659f747946461350ade5a8 (patch) | |
| tree | d261964cafdd51154b1ad757574f508da2d9ad76 /src/core/dbus-timer.c | |
| parent | 566cac15ed36506e2bb766313a5d4e0825bc6499 (diff) | |
| parent | 022ed72eff07ca6c1409747e774ef5b35724c9df (diff) | |
Merge tag 'v230-3.parabola1' into parabola
Diffstat (limited to 'src/core/dbus-timer.c')
| -rw-r--r-- | src/core/dbus-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c index bc121b83a2..a0e61b023e 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -156,7 +156,7 @@ static int property_get_next_elapse_monotonic( usec_t a, b; a = now(CLOCK_MONOTONIC); - b = now(CLOCK_BOOTTIME); + b = now(clock_boottime_or_monotonic()); if (t->next_elapse_monotonic_or_boottime + a > b) x = t->next_elapse_monotonic_or_boottime + a - b; |