From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 10 Jul 2016 10:04:55 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/autoplay-fix'
X-Git-Tag: v0.5.6~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f2940b2fbde865256bc35c74e3bd624d2ff48d2e;hp=92d85d340495154f3fda23f322af13fc9de42155

Merge branch 'refs/heads/t/autoplay-fix'

A single commit which was cooking for a month.

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

diff --git a/vss.c b/vss.c
index 51db7686..2acff1cb 100644
--- 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);
 	}