Merge branch 'master' into release-10.1.0

CONTRIBUTORS.md

@@ -14,7 +14,8 @@
  - [grafixeyehero](https://github.com/grafixeyehero)
  - [cvium](https://github.com/cvium)
  - [wtayl0r](https://github.com/wtayl0r)
- 
+ - [TtheCreator](https://github.com/Tthecreator)
+
 # Emby Contributors
 
  - [LukePulverenti](https://github.com/LukePulverenti)

MediaBrowser.Api/Subtitles/SubtitleService.cs

@@ -156,14 +156,19 @@ namespace MediaBrowser.Api.Subtitles
                 throw new ArgumentException("HLS Subtitles are not supported for this media.");
             }
 
+            var segmentLengthTicks = TimeSpan.FromSeconds(request.SegmentLength).Ticks;
+            if (segmentLengthTicks <= 0)
+            {
+                throw new ArgumentException("segmentLength was not given, or it was given incorrectly. (It should be bigger than 0)");
+            }
+
             builder.AppendLine("#EXTM3U");
             builder.AppendLine("#EXT-X-TARGETDURATION:" + request.SegmentLength.ToString(CultureInfo.InvariantCulture));
             builder.AppendLine("#EXT-X-VERSION:3");
             builder.AppendLine("#EXT-X-MEDIA-SEQUENCE:0");
             builder.AppendLine("#EXT-X-PLAYLIST-TYPE:VOD");
 
-            long positionTicks = 0;
-            var segmentLengthTicks = TimeSpan.FromSeconds(request.SegmentLength).Ticks;
+            long positionTicks = 0; 
 
             var accessToken = _authContext.GetAuthorizationInfo(Request).Token;