diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/Drawing/ImageOverlay.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 77cdfa085..30e87a8ea 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.Entities item.DateModified = DateTime.UtcNow; } - AddChildrenInternal(new[] { item }); + AddChildInternal(item); await LibraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false); @@ -110,9 +110,13 @@ namespace MediaBrowser.Controller.Entities { foreach (var child in children) { - _children.Add(child); + AddChildInternal(child); } } + protected void AddChildInternal(BaseItem child) + { + _children.Add(child); + } protected void RemoveChildrenInternal(IEnumerable<BaseItem> children) { diff --git a/MediaBrowser.Model/Drawing/ImageOverlay.cs b/MediaBrowser.Model/Drawing/ImageOverlay.cs index e5c7e0fb7..8ae53746b 100644 --- a/MediaBrowser.Model/Drawing/ImageOverlay.cs +++ b/MediaBrowser.Model/Drawing/ImageOverlay.cs @@ -9,6 +9,10 @@ namespace MediaBrowser.Model.Drawing /// <summary> /// The watched /// </summary> - Watched + Played, + /// <summary> + /// The percent played + /// </summary> + PercentPlayed } } diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs index 7792a28bb..aa30cee26 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs @@ -529,7 +529,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer { new ClientWebSocket(); - _supportsNativeWebSocket = false; + _supportsNativeWebSocket = true; } catch (PlatformNotSupportedException) { |