aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-02-09 19:16:09 -0500
committerGitHub <noreply@github.com>2017-02-09 19:16:09 -0500
commit77f5b522a9b49f51248072e6299c0b020ac16bda (patch)
tree37df28baca7e384fe47514d3974b7112dae8238f
parent9afc7ff900c3754eaa8214be65b1e16d6379192e (diff)
parent4bc2a77df188d72cbf5416cccf5ff33d9d075560 (diff)
Merge pull request #2455 from MediaBrowser/dev
Dev
-rw-r--r--Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs5
-rw-r--r--SharedVersion.cs2
2 files changed, 6 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index cd5fd0c8c..bbb060203 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -423,6 +423,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
tunerChannel.Name = epgChannel.Name;
}
+ if (!string.IsNullOrWhiteSpace(epgChannel.ImageUrl))
+ {
+ tunerChannel.ImageUrl = epgChannel.ImageUrl;
+ tunerChannel.HasImage = true;
+ }
}
}
}
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 705c32691..7a98bd22e 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.0.104")]
+[assembly: AssemblyVersion("3.2.1.100")]