Merge pull request #4084 from BaronGreenback/PlayTo-url-corruption-fix

Unstable: PlayTo corruption url fix

1 files changed, 8 insertions, 12 deletions

diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index 3d1dd3e73..21877f121 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -130,25 +130,21 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private string GetUuid(string usn)
+        private static string GetUuid(string usn)
         {
-            var found = false;
-            var index = usn.IndexOf("uuid:", StringComparison.OrdinalIgnoreCase);
-            if (index != -1)
-            {
-                usn = usn.Substring(index);
-                found = true;
-            }
+            const string UuidStr = "uuid:";
+            const string UuidColonStr = "::";
 
-            index = usn.IndexOf("::", StringComparison.OrdinalIgnoreCase);
+            var index = usn.IndexOf(UuidStr, StringComparison.OrdinalIgnoreCase);
             if (index != -1)
             {
-                usn = usn.Substring(0, index);
+                return usn.Substring(index + UuidStr.Length);
             }
 
-            if (found)
+            index = usn.IndexOf(UuidColonStr, StringComparison.OrdinalIgnoreCase);
+            if (index != -1)
             {
-                return usn;
+                usn = usn.Substring(0, index + UuidColonStr.Length);
             }
 
             return usn.GetMD5().ToString("N", CultureInfo.InvariantCulture);