Merge pull request #1140 from MediaBrowser/dev

3.0.5675.1
MediaBrowser · Jul 16, 2015 · 834ea8b · 834ea8b
2 parents b78d532 + f430f7e
commit 834ea8b
Show file tree

Hide file tree

Showing 210 changed files with 15,830 additions and 2,734 deletions.
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -340,7 +340,7 @@ private async void PingTimer(TranscodingJob job, bool isProgressCheckIn)
                 // We can really reduce the timeout for apps that are using the newer api
                 if (!string.IsNullOrWhiteSpace(job.PlaySessionId))
                 {
-                    timerDuration = 120000;
+                    timerDuration = 300000;
                 }
             }