aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-04 23:16:55 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-04 23:16:55 -0500
commitca83644e1cf936d3f95572cad8a35fba0148e1b7 (patch)
tree96dc6c7638789d261a2faec20ec2c9e58d46118d
parent21ebd05a0ef72c0b4c8f5d0c3d84077e0579b5ba (diff)
handle no subs setting
-rw-r--r--MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index e4a085f42..dfc6fc125 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -17,6 +17,7 @@ using System.Threading;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Common.IO;
+using MediaBrowser.Model.Configuration;
namespace MediaBrowser.Server.Implementations.Library
{
@@ -276,7 +277,7 @@ namespace MediaBrowser.Server.Implementations.Library
private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
{
- if (userData.SubtitleStreamIndex.HasValue && user.Configuration.RememberSubtitleSelections)
+ if (userData.SubtitleStreamIndex.HasValue && user.Configuration.RememberSubtitleSelections && user.Configuration.SubtitleMode != SubtitlePlaybackMode.None)
{
var index = userData.SubtitleStreamIndex.Value;
// Make sure the saved index is still valid