aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/LiveTv/TunerHosts
diff options
context:
space:
mode:
authorShadowghost <Ghost_of_Stone@web.de>2023-03-16 11:07:22 +0100
committerShadowghost <Ghost_of_Stone@web.de>2023-03-16 11:07:22 +0100
commit520c07e8cad3e4372f6a5214160d1600106a7bfd (patch)
tree1a50b779de47026ed6bd6b4344eb019e13aa3bdc /Emby.Server.Implementations/LiveTv/TunerHosts
parent80b8661008f271efad595e75de7b0c50971b131b (diff)
parent24cc1e9aead3a353b4749dc3e0c0d17a79a85c96 (diff)
Merge branch 'master' into network-rewrite
Diffstat (limited to 'Emby.Server.Implementations/LiveTv/TunerHosts')
-rw-r--r--Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index 046be7c5c7..f2020e05fe 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -122,9 +122,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
var attributes = ParseExtInf(extInf, out string remaining);
extInf = remaining;
- if (attributes.TryGetValue("tvg-logo", out string value))
+ if (attributes.TryGetValue("tvg-logo", out string tvgLogo))
{
- channel.ImageUrl = value;
+ channel.ImageUrl = tvgLogo;
+ }
+ else if (attributes.TryGetValue("logo", out string logo))
+ {
+ channel.ImageUrl = logo;
}
if (attributes.TryGetValue("group-title", out string groupTitle))