diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-01-25 03:16:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 03:16:31 -0500 |
| commit | a64d69af16a6f6b4e9e9e02bb0435de3f3198153 (patch) | |
| tree | f6df773622c5dbbf865c1f3b1f0640b6a9cdd16d /Emby.Server.Implementations | |
| parent | 5cbed08e0263b4c52b1092d6603619fec8b730b0 (diff) | |
| parent | cf470529b1e67a4974c30a1258c41af38fed190b (diff) | |
Merge pull request #2419 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
3 files changed, 2 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs index 81d1571b1..1fe6e75a9 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs +++ b/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; diff --git a/Emby.Server.Implementations/Migrations/GuideMigration.cs b/Emby.Server.Implementations/Migrations/GuideMigration.cs index af7068279..2e0219f93 100644 --- a/Emby.Server.Implementations/Migrations/GuideMigration.cs +++ b/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)) { diff --git a/Emby.Server.Implementations/Migrations/LibraryScanMigration.cs b/Emby.Server.Implementations/Migrations/LibraryScanMigration.cs index 600dd8033..bd185bc9c 100644 --- a/Emby.Server.Implementations/Migrations/LibraryScanMigration.cs +++ b/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(); |