X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=audiod.c;fp=audiod.c;h=517958474f39077ebbbf3b6557d4bab6a6ebf82c;hb=869fa1d76e7f88470120552792ca71068b49a747;hp=254bcb8d8c4bac2947e52c3310fb7051fe5f1153;hpb=64411efdbd90f1080ad1fd010d468cea63aec923;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 254bcb8d..51795847 100644
--- a/audiod.c
+++ b/audiod.c
@@ -305,6 +305,7 @@ char *get_time_string(void)
 		rskip; /* receiver start - sss */
 	int slot_num = get_play_time_slot_num();
 	struct slot_info *s = slot_num < 0? NULL : &slot[slot_num];
+	bool writer_active = s && s->wns && s->wns[0].btrn;
 	char *msg;
 
 	if (audiod_status == AUDIOD_OFF)
@@ -318,11 +319,11 @@ char *get_time_string(void)
 	}
 	/*
 	 * Valid status items and playing, set length and tmp to the stream
-	 * start. We use the slot info and fall back to the info from current
-	 * status items if no slot info is available.
+	 * start. We use the writer start time from the slot info and fall back
+	 * to the info from current status items if no writer is active yet.
 	 */
 	tmp = &stat_task->server_stream_start;
-	if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */
+	if (writer_active) {
 		btr_get_node_start(s->wns[0].btrn, &wstime);
 		if (wstime.tv_sec != 0) { /* writer wrote something */
 			if (s->server_stream_start.tv_sec == 0) {
@@ -339,7 +340,7 @@ char *get_time_string(void)
 		tv_diff(tmp, &stat_task->sa_time_diff, &sss);
 	else
 		tv_add(tmp, &stat_task->sa_time_diff, &sss);
-	if (!s || !s->wns || !s->wns[0].btrn || wstime.tv_sec == 0) {
+	if (!writer_active) {
 		struct timeval diff;
 		tv_diff(now, &sss, &diff);
 		seconds = diff.tv_sec + stat_task->offset_seconds;