Merge pull request #1314 from MediaBrowser/master

merge from master

MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -514,10 +514,7 @@ namespace MediaBrowser.Api.Playback.Hls
             // Main stream
             var playlistUrl = isLiveStream ? "live.m3u8" : "main.m3u8";
 
-            if ((Request.UserAgent ?? string.Empty).IndexOf("roku", StringComparison.OrdinalIgnoreCase) == -1)
-            {
-                playlistUrl += queryString;
-            }
+            playlistUrl += queryString;
 
             var request = state.Request;
 
@@ -704,6 +701,11 @@ namespace MediaBrowser.Api.Playback.Hls
             var queryStringIndex = Request.RawUrl.IndexOf('?');
             var queryString = queryStringIndex == -1 ? string.Empty : Request.RawUrl.Substring(queryStringIndex);
 
+            if ((Request.UserAgent ?? string.Empty).IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                queryString = string.Empty;
+            }
+
             var index = 0;
 
             foreach (var length in segmentLengths)