From 2f268a996274057d154bc3ed5172a0224818d056 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 22 Jun 2015 11:04:23 +0100
Subject: [PATCH] Fix final issues with HLS 404 handling #537

---
 .../java/com/google/android/exoplayer/hls/HlsSampleSource.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
index 067d29bfa3..7bb5162a57 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
@@ -389,6 +389,9 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader
   public void onLoadError(Loadable loadable, IOException e) {
     if (chunkSource.onChunkLoadError(currentLoadable, e)) {
       // Error handled by source.
+      if (previousTsLoadable == null && !isPendingReset()) {
+        pendingResetPositionUs = currentTsLoadable.startTimeUs;
+      }
       clearCurrentLoadable();
     } else {
       currentLoadableException = e;