michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2419 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-01-25 03:16:31 -05:00 committed by GitHub
commit a64d69af16
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Dlna/PlayTo/Device.cs
View File

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

2
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -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;

2
Emby.Server.Implementations/Migrations/GuideMigration.cs
View File

@ -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))
{

2
Emby.Server.Implementations/Migrations/LibraryScanMigration.cs
View File

@ -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();