From 6ef9fd9513317df45d05d4eb607559b7ef1ff995 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 22 Apr 2013 12:04:54 -0400 Subject: [PATCH] #182 - Eliminate duplicates in the selection list for max rating in user screen --- MediaBrowser.Controller/Entities/BaseItem.cs | 4 ++-- MediaBrowser.Model/Configuration/UserConfiguration.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index b4765759cb..7bcd3db912 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -852,12 +852,12 @@ namespace MediaBrowser.Controller.Entities throw new ArgumentNullException("user"); } - if (string.IsNullOrEmpty(user.Configuration.MaxParentalRating)) + if (user.Configuration.MaxParentalRating == null) { return true; } - return Ratings.Level(CustomRating ?? OfficialRating) <= Ratings.Level(user.Configuration.MaxParentalRating); + return Ratings.Level(CustomRating ?? OfficialRating) <= user.Configuration.MaxParentalRating.Value; } /// diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index be784d1c60..deb6fdb3d2 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -10,7 +10,7 @@ namespace MediaBrowser.Model.Configuration /// Gets or sets the max parental rating. /// /// The max parental rating. - public string MaxParentalRating { get; set; } + public int? MaxParentalRating { get; set; } /// /// Gets or sets a value indicating whether [use custom library].