aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/TranscodingThrottler.cs
diff options
context:
space:
mode:
authorTavares André <tavares_and@hotmail.com>2015-05-20 17:46:53 +0200
committerTavares André <tavares_and@hotmail.com>2015-05-20 17:46:53 +0200
commit12a8a88a38f52af99f0f640780a09cc860ba4ab7 (patch)
tree43fbe62d4f4c30b3912402d44629f1a87f94e727 /MediaBrowser.Api/Playback/TranscodingThrottler.cs
parent33f633d37a5709230ab94773077bca02a0cd317b (diff)
parent448dd949c78d2309a8dd27fc2c22cfa19594cadb (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Api/Playback/TranscodingThrottler.cs')
-rw-r--r--MediaBrowser.Api/Playback/TranscodingThrottler.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/TranscodingThrottler.cs b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
index ece455009..fec3dda86 100644
--- a/MediaBrowser.Api/Playback/TranscodingThrottler.cs
+++ b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
@@ -42,7 +42,7 @@ namespace MediaBrowser.Api.Playback
var options = GetOptions();
- if (options.EnableThrottling && IsThrottleAllowed(_job, options.ThrottleThresholdSeconds))
+ if (options.EnableThrottling && IsThrottleAllowed(_job, options.ThrottleThresholdInSeconds))
{
PauseTranscoding();
}