From: Andre Noll <maan@systemlinux.org>
Date: Thu, 31 Jul 2014 06:59:47 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/play_fix'
X-Git-Tag: v0.5.3~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=093dda1824631372587d107d64601389027c6187

Merge branch 'refs/heads/t/play_fix'

Cooking since two weeks.

	* 9c1aa5 Never start playback at an empty chunk.

Conflicts:
	afh_recv.c
---

093dda1824631372587d107d64601389027c6187
diff --cc afh_recv.c
index 657a2057,89722fef..92e9e839
--- a/afh_recv.c
+++ b/afh_recv.c
@@@ -59,7 -59,9 +59,8 @@@ static int afh_execute(struct btr_node 
  			return ret;
  		if (x >= pard->afhi.chunks_total)
  			return -ERRNO_TO_PARA_ERROR(EINVAL);
- 		pard->first_chunk = pard->current_chunk = x;
+ 		pard->first_chunk = afh_get_start_chunk(x, &pard->afhi);
+ 		pard->current_chunk = pard->first_chunk;
 -		rn->task.error = 0;
  		return 1;
  	}
  	return -E_BTR_NAVAIL;