if (string.IsNullOrWhiteSpace(result))

            {
                attributes.TryGetValue("channel-id", out result);
            }

2 files changed, 10 insertions, 5 deletions

diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index 34d0dd853..073da48a0 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)
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 68d9dc4d4..76ebc0852 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.1.114")]
+[assembly: AssemblyVersion("3.2.1.115")]