diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2021-01-18 14:24:35 +0100 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2021-01-23 15:37:26 -0500 |
| commit | d129afa74eebadc35b78cc56909985896fe558b1 (patch) | |
| tree | 0cb9416d4fa98011251e2526a9b3bca94f6edde0 | |
| parent | bc8a1d22768965dd72b48123e23ba18b0c3f1642 (diff) | |
Merge pull request #5025 from BaronGreenback/DlnaFix
(cherry picked from commit b9691e87123d9fc219ae8a882bd25339a253e61d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
| -rw-r--r-- | Emby.Dlna/Didl/DidlBuilder.cs | 1 | ||||
| -rw-r--r-- | Emby.Dlna/PlayTo/PlayToController.cs | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs index abaf522bc..8b50d47fb 100644 --- a/Emby.Dlna/Didl/DidlBuilder.cs +++ b/Emby.Dlna/Didl/DidlBuilder.cs @@ -96,6 +96,7 @@ namespace Emby.Dlna.Didl using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8)) { + // If this using are changed to single lines, then write.Flush needs to be appended before the return. using (var writer = XmlWriter.Create(builder, settings)) { // writer.WriteStartDocument(); diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs index 311fae240..315be1e8b 100644 --- a/Emby.Dlna/PlayTo/PlayToController.cs +++ b/Emby.Dlna/PlayTo/PlayToController.cs @@ -896,16 +896,16 @@ namespace Emby.Dlna.PlayTo var parts = url.Split('/'); - for (var i = 0; i < parts.Length; i++) + for (var i = 0; i < parts.Length - 1; i++) { var part = parts[i]; if (string.Equals(part, "audio", StringComparison.OrdinalIgnoreCase) || string.Equals(part, "videos", StringComparison.OrdinalIgnoreCase)) { - if (parts.Length > i + 1) + if (Guid.TryParse(parts[i + 1], out var result)) { - return Guid.Parse(parts[i + 1]); + return result; } } } |