From 028a0a857ab6d7f42544e2ae3a3f79f5632844fc Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 12 Mar 2015 10:59:08 -0400
Subject: remove some usage of ActiveService

---
 MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs         | 6 ++----
 .../LiveTv/RefreshChannelsScheduledTask.cs                          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 337bba6a21..14a2b08a76 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1843,15 +1843,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private bool IsLiveTvEnabled(User user)
         {
-            return user.Policy.EnableLiveTvAccess && ActiveService != null;
+            return user.Policy.EnableLiveTvAccess && Services.Count > 0;
         }
 
         public IEnumerable<User> GetEnabledUsers()
         {
-            var service = ActiveService;
-
             return _userManager.Users
-                .Where(i => i.Policy.EnableLiveTvAccess && service != null);
+                .Where(IsLiveTvEnabled);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs b/MediaBrowser.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
index 05cbfede0c..de2351434f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
@@ -52,7 +52,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         public bool IsHidden
         {
-            get { return _liveTvManager.ActiveService == null; }
+            get { return _liveTvManager.Services.Count == 0; }
         }
 
         public bool IsEnabled
-- 
cgit v1.2.3