From ecf7d1be9e68d665bb61d1b43b3daec0933e0ddd Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 16 Jun 2015 13:50:22 +0100
Subject: [PATCH] Fix HLS track selection

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

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 5ae903542d..91e841af57 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
@@ -202,11 +202,11 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader
     enabledTrackCount--;
     trackEnabledStates[track] = false;
     pendingDiscontinuities[track] = false;
-    if (loadControlRegistered) {
-      loadControl.unregister(this);
-      loadControlRegistered = false;
-    }
     if (enabledTrackCount == 0) {
+      if (loadControlRegistered) {
+        loadControl.unregister(this);
+        loadControlRegistered = false;
+      }
       if (loader.isLoading()) {
         loader.cancelLoading();
       } else {