Merge pull request #2419 from MediaBrowser/dev

Dev

Emby.Dlna/PlayTo/Device.cs

@@ -112,7 +112,7 @@ namespace Emby.Dlna.PlayTo
 
         private int GetInactiveTimerIntervalMs()
         {
-            return 20000;
+            return 30000;
         }
 
         public void Start()

Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs

@@ -103,7 +103,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     }
                     else
                     {
-                        channel.Id = channelIdPrefix + channel.Id.GetMD5().ToString("N");
+                        channel.Id = channelIdPrefix + urlHash + channel.Id.GetMD5().ToString("N");
                     }
 
                     channel.Path = line;

Emby.Server.Implementations/Migrations/GuideMigration.cs

@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Migrations
 
         public async Task Run()
         {
-            var name = "GuideRefresh";
+            var name = "GuideRefresh1";
 
             if (!_config.Configuration.Migrations.Contains(name, StringComparer.OrdinalIgnoreCase))
             {

Emby.Server.Implementations/Migrations/LibraryScanMigration.cs

@@ -35,8 +35,6 @@ namespace Emby.Server.Implementations.Migrations
                 {
                     _taskManager.QueueScheduledTask(_taskManager.ScheduledTasks.Select(i => i.ScheduledTask)
                             .First(i => string.Equals(i.Key, "RefreshLibrary", StringComparison.OrdinalIgnoreCase)));
-                    _taskManager.QueueScheduledTask(_taskManager.ScheduledTasks.Select(i => i.ScheduledTask)
-                            .First(i => string.Equals(i.Key, "RefreshGuide", StringComparison.OrdinalIgnoreCase)));
                 });
 
                 var list = _config.Configuration.Migrations.ToList();