Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-25 06:58:40 +02:00
Code Issues 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
parent 5cbed08e02 cf470529b1
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() private int GetInactiveTimerIntervalMs()
{ {
return 20000; return 30000;
} }
public void Start() public void Start()

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

@ -103,7 +103,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
} }
else else
{ {
channel.Id = channelIdPrefix + channel.Id.GetMD5().ToString("N"); channel.Id = channelIdPrefix + urlHash + channel.Id.GetMD5().ToString("N");
} }
channel.Path = line; 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() public async Task Run()
{ {
var name = "GuideRefresh"; var name = "GuideRefresh1";
if (!_config.Configuration.Migrations.Contains(name, StringComparer.OrdinalIgnoreCase)) 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) _taskManager.QueueScheduledTask(_taskManager.ScheduledTasks.Select(i => i.ScheduledTask)
.First(i => string.Equals(i.Key, "RefreshLibrary", StringComparison.OrdinalIgnoreCase))); .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(); var list = _config.Configuration.Migrations.ToList();