Browse Source

resolve live tv with ios

Luke Pulverenti 10 years ago
parent
commit
52e3d875c2

+ 3 - 2
MediaBrowser.Api/Playback/MediaInfoService.cs

@@ -325,10 +325,11 @@ namespace MediaBrowser.Api.Playback
         private int? GetMaxBitrate(int? clientMaxBitrate)
         {
             var maxBitrate = clientMaxBitrate;
+            var remoteClientMaxBitrate = _config.Configuration.RemoteClientBitrateLimit;
 
-            if (_config.Configuration.RemoteClientBitrateLimit > 0 && !_networkManager.IsInLocalNetwork(Request.RemoteIp))
+            if (remoteClientMaxBitrate > 0 && !_networkManager.IsInLocalNetwork(Request.RemoteIp))
             {
-                maxBitrate = Math.Min(maxBitrate ?? _config.Configuration.RemoteClientBitrateLimit, _config.Configuration.RemoteClientBitrateLimit);
+                maxBitrate = Math.Min(maxBitrate ?? remoteClientMaxBitrate, remoteClientMaxBitrate);
             }
 
             return maxBitrate;

+ 7 - 1
MediaBrowser.Api/Sync/SyncService.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Dto;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Sync;
@@ -230,6 +231,11 @@ namespace MediaBrowser.Api.Sync
         {
             var jobItem = _syncManager.GetJobItem(request.Id);
 
+            if (jobItem == null)
+            {
+                throw new ResourceNotFoundException();
+            }
+
             if (jobItem.Status < SyncJobItemStatus.ReadyToTransfer)
             {
                 throw new ArgumentException("The job item is not yet ready for transfer.");