From 2c22de3773506e283767c4ed9112c16c741f7400 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 12 Dec 2013 23:06:38 -0500
Subject: update tv recording page

---
 MediaBrowser.Server.Implementations/Drawing/ImageHeader.cs             | 3 ++-
 MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs            | 2 +-
 .../MediaBrowser.Server.Implementations.csproj                         | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageHeader.cs b/MediaBrowser.Server.Implementations/Drawing/ImageHeader.cs
index f9cf90787d..3d53d2b86f 100644
--- a/MediaBrowser.Server.Implementations/Drawing/ImageHeader.cs
+++ b/MediaBrowser.Server.Implementations/Drawing/ImageHeader.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
@@ -69,6 +68,8 @@ namespace MediaBrowser.Server.Implementations.Drawing
                 {
                     fs.CopyTo(memoryStream);
 
+                    memoryStream.Position = 0;
+
                     // Co it the old fashioned way
                     using (var b = Image.FromStream(memoryStream, true, false))
                     {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 185a016637..b2796bc684 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -506,7 +506,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             var dto = new TimerInfoDto
             {
                 ChannelName = info.ChannelName,
-                Description = info.Description,
+                Overview = info.Overview,
                 EndDate = info.EndDate,
                 Name = info.Name,
                 StartDate = info.StartDate,
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 41a70790a6..031fc6e922 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -338,6 +338,7 @@
       <Link>swagger-ui\swagger-ui.min.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Localization\Ratings\be.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition=" '$(ConfigurationName)' != 'Release Mono' " />
-- 
cgit v1.2.3