aboutsummaryrefslogtreecommitdiffstats
path: root/src/timer.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-12-13 21:57:44 +0100
committerMax Kellermann <max@duempel.org>2011-12-13 21:57:44 +0100
commitaa4f45b9a56779355f15f867dce9ab0759cb5f7a (patch)
treee0793dfab38b5540a02c8a8e3d4f2612fe2c3faa /src/timer.c
parent006b8fa3f07e948cbd277e91546dd815769d7a5e (diff)
parent96ad5b84446be0bf603895adaf0ec2e97bee11aa (diff)
downloadmpd-aa4f45b9a56779355f15f867dce9ab0759cb5f7a.tar.gz
mpd-aa4f45b9a56779355f15f867dce9ab0759cb5f7a.tar.xz
mpd-aa4f45b9a56779355f15f867dce9ab0759cb5f7a.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (limited to 'src/timer.c')
-rw-r--r--src/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timer.c b/src/timer.c
index bbc7a4ab9..691ab76be 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -81,7 +81,7 @@ timer_delay(const struct timer *timer)
if (delay > G_MAXINT)
delay = G_MAXINT;
- return delay / 1000;
+ return delay;
}
void timer_sync(struct timer *timer)