Merge branch 'refs/heads/t/autoplay-fix'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 10 Jul 2016 10:04:55 +0000 (12:04 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 10 Jul 2016 10:04:55 +0000 (12:04 +0200)
A single commit which was cooking for a month.

* refs/heads/t/autoplay-fix:
  server: Fix --autoplay-delay.

vss.c

diff --git a/vss.c b/vss.c
index 51db768..2acff1c 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -1187,7 +1187,7 @@ void init_vss_task(int afs_socket, struct sched *s)
                mmd->vss_status_flags |= VSS_PLAYING;
                mmd->new_vss_status_flags |= VSS_PLAYING;
                ms2tv(autoplay_delay, &tmp);
-               tv_add(now, &tmp, &vsst->autoplay_barrier);
+               tv_add(clock_get_realtime(NULL), &tmp, &vsst->autoplay_barrier);
                tv_add(&vsst->autoplay_barrier, &vsst->announce_tv,
                        &vsst->data_send_barrier);
        }