aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities
diff options
context:
space:
mode:
authorSven Van den brande <sven.vandenbrande@outlook.com>2014-11-12 19:21:14 +0100
committerSven Van den brande <sven.vandenbrande@outlook.com>2014-11-12 19:21:14 +0100
commitb3c0ab869409a743c736a4e9f0cb91260187c7c6 (patch)
tree8b90ef0f259ffcb0f4c3b27bb9014e1d89a6ee9a /MediaBrowser.Controller/Entities
parentcbd2c2fc5435aead30513150fc9f50c86eebde49 (diff)
parent4f5c7687042148507d5cedfcec81ab355f478f19 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.WebDashboard/dashboard-ui/livetvnewrecording.html MediaBrowser.WebDashboard/dashboard-ui/livetvseriestimer.html MediaBrowser.WebDashboard/dashboard-ui/livetvtimer.html
Diffstat (limited to 'MediaBrowser.Controller/Entities')
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index dc9f83b3c9..1f7c62de0b 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -139,14 +139,14 @@ namespace MediaBrowser.Controller.Entities.Audio
{
var id = this.GetProviderId(MetadataProviders.MusicBrainzReleaseGroup);
- if (!string.IsNullOrEmpty(id))
+ if (!string.IsNullOrWhiteSpace(id))
{
return "MusicAlbum-MusicBrainzReleaseGroup-" + id;
}
id = this.GetProviderId(MetadataProviders.MusicBrainzAlbum);
- if (!string.IsNullOrEmpty(id))
+ if (!string.IsNullOrWhiteSpace(id))
{
return "MusicAlbum-Musicbrainz-" + id;
}