Prechádzať zdrojové kódy

Merge pull request #5025 from BaronGreenback/DlnaFix

(cherry picked from commit b9691e87123d9fc219ae8a882bd25339a253e61d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
Claus Vium 4 rokov pred
rodič
commit
d129afa74e

+ 1 - 0
Emby.Dlna/Didl/DidlBuilder.cs

@@ -96,6 +96,7 @@ namespace Emby.Dlna.Didl
 
 
             using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
             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))
                 using (var writer = XmlWriter.Create(builder, settings))
                 {
                 {
                     // writer.WriteStartDocument();
                     // writer.WriteStartDocument();

+ 3 - 3
Emby.Dlna/PlayTo/PlayToController.cs

@@ -896,16 +896,16 @@ namespace Emby.Dlna.PlayTo
 
 
                 var parts = url.Split('/');
                 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];
                     var part = parts[i];
 
 
                     if (string.Equals(part, "audio", StringComparison.OrdinalIgnoreCase) ||
                     if (string.Equals(part, "audio", StringComparison.OrdinalIgnoreCase) ||
                         string.Equals(part, "videos", 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;
                         }
                         }
                     }
                     }
                 }
                 }