diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:28:05 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:28:05 +0100 |
| commit | ae0732136fe72e5e3c26517e9e350178bf2e9b59 (patch) | |
| tree | cdfc9cd6ce97ceca0b2d8d3023d9815f80357dd5 /MediaBrowser.Controller/Entities/UserRootFolder.cs | |
| parent | d7b7be395b76c7fcc49d3baffeb59d51a9b36378 (diff) | |
| parent | f8dd182e422db49d98cc090f4e205cc46517f610 (diff) | |
Merge remote-tracking branch 'upstream/dev' into build-system-consolidation
Diffstat (limited to 'MediaBrowser.Controller/Entities/UserRootFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/UserRootFolder.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs index f8e843d92..abfcd7984 100644 --- a/MediaBrowser.Controller/Entities/UserRootFolder.cs +++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.Serialization; +using MediaBrowser.Model.Serialization; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Library; using MediaBrowser.Model.Querying; @@ -78,7 +78,7 @@ namespace MediaBrowser.Controller.Entities return new QueryResult<BaseItem> { TotalRecordCount = totalCount, - Items = itemsArray + Items = itemsArray //TODO Fix The co-variant conversion between Folder[] and BaseItem[], this can generate runtime issues. }; } |