lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1489 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-02-22 11:32:29 -05:00
commit c6da094843
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -50,12 +50,14 @@ namespace MediaBrowser.Model.Configuration
public bool RememberAudioSelections { get; set; } public bool RememberAudioSelections { get; set; }
public bool RememberSubtitleSelections { get; set; } public bool RememberSubtitleSelections { get; set; }
public bool EnableEpisodeAutoQueue { get; set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="UserConfiguration" /> class. /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
/// </summary> /// </summary>
public UserConfiguration() public UserConfiguration()
{ {
EnableEpisodeAutoQueue = true;
RememberAudioSelections = true; RememberAudioSelections = true;
RememberSubtitleSelections = true; RememberSubtitleSelections = true;

4
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -771,6 +771,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
recordPath = Path.ChangeExtension(recordPath, ".mp4"); recordPath = Path.ChangeExtension(recordPath, ".mp4");
} }
_libraryMonitor.ReportFileSystemChangeBeginning(recordPath);
recording.Path = recordPath; recording.Path = recordPath;
recording.Status = RecordingStatus.InProgress; recording.Status = RecordingStatus.InProgress;
recording.DateLastUpdated = DateTime.UtcNow; recording.DateLastUpdated = DateTime.UtcNow;
@ -801,6 +803,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{ {
result.Item2.Release(); result.Item2.Release();
} }
_libraryMonitor.ReportFileSystemChangeComplete(recordPath, false);
} }
} }
catch (OperationCanceledException) catch (OperationCanceledException)