aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-10-05 22:50:20 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-10-05 22:50:20 -0400
commit6271ca99c8cdb36c1e8674bdd203e31a2d5a1fe1 (patch)
tree4223361c9ea0d103444def4998327e05a0489fde
parent5daca3238ebda99719c3271217f1772e8b07f9a5 (diff)
update polymer
-rw-r--r--Emby.Drawing/ImageProcessor.cs2
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs7
2 files changed, 7 insertions, 2 deletions
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index afec3d03b..120a4cedb 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -230,7 +230,7 @@ namespace Emby.Drawing
_imageEncoder.EncodeImage(originalImagePath, cacheFilePath, newWidth, newHeight, quality, options);
// ImageMagick doesn't seem to always release it right away
- await Task.Delay(100).ConfigureAwait(false);
+ await Task.Delay(300).ConfigureAwait(false);
}
}
finally
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 769c4757a..875ea6d28 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -554,8 +554,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
isNew = true;
}
- item.ChannelType = channelInfo.ChannelType;
+ if (!string.Equals(channelInfo.Id, item.ExternalId))
+ {
+ isNew = true;
+ }
item.ExternalId = channelInfo.Id;
+
+ item.ChannelType = channelInfo.ChannelType;
item.ServiceName = serviceName;
item.Number = channelInfo.Number;