From 34171a7507d393d2afbe0f4dd2719f9067441e8a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 22 Feb 2017 16:13:27 -0500
Subject: if (string.IsNullOrWhiteSpace(result))             {                
 attributes.TryGetValue("channel-id", out result);             }

---
 Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index 34d0dd8535..073da48a02 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -298,15 +298,20 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
         private string GetTunerChannelId(Dictionary<string, string> attributes)
         {
+            var values = new List<string>();
+
             string result;
-            attributes.TryGetValue("tvg-id", out result);
+            if (attributes.TryGetValue("tvg-id", out result))
+            {
+                values.Add(result);
+            }
 
-            if (string.IsNullOrWhiteSpace(result))
+            if (attributes.TryGetValue("channel-id", out result))
             {
-                attributes.TryGetValue("channel-id", out result);
+                values.Add(result);
             }
 
-            return result;
+            return values.Count == 0 ? null : string.Join("-", values.ToArray());
         }
 
         private Dictionary<string, string> ParseExtInf(string line, out string remaining)
-- 
cgit v1.2.3