github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 13:33:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of git://github.com/kayone/NzbDrone

Browse source 
Conflicts:
	NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs
	NzbDrone.Core/Providers/SeriesProvider.cs
This commit is contained in:
Mark McDowall 2011-06-13 19:23:43 -07:00
commit a290a0dcb0
50 changed files with 6762 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

5
NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Ninject;
using NLog;
using NzbDrone.Core.Helpers;
using NzbDrone.Core.Model;
@ -47,7 +48,7 @@ namespace NzbDrone.Core.Providers.Jobs
throw new ArgumentOutOfRangeException("targetId");
var episode = _episodeProvider.GetEpisode(targetId);
if (episode == null)
{
Logger.Error("Unable to find an episode {0} in database", targetId);
@ -61,7 +62,7 @@ namespace NzbDrone.Core.Providers.Jobs
var title = _sceneNameMappingProvider.GetSceneName(series.SeriesId);
if(string.IsNullOrWhiteSpace(title))
if (string.IsNullOrWhiteSpace(title))
{
title = series.Title;
}