aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Notifications
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-06-09 15:27:29 -0400
committerGitHub <noreply@github.com>2017-06-09 15:27:29 -0400
commit1b0f6f6c56ee82fee149c26518284ac994394270 (patch)
tree118bda4b0be57add2228d7e2d1ebf40b94999bf5 /Emby.Server.Implementations/Notifications
parent9cb197d5112eadfc6ce80163aa79bb968ed2d554 (diff)
parent15ee918ac60c3c9b35ca7ea7a1eca4396493f142 (diff)
Merge pull request #2695 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Notifications')
-rw-r--r--Emby.Server.Implementations/Notifications/Notifications.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Notifications/Notifications.cs b/Emby.Server.Implementations/Notifications/Notifications.cs
index 8f24dfe1a..f95b3f701 100644
--- a/Emby.Server.Implementations/Notifications/Notifications.cs
+++ b/Emby.Server.Implementations/Notifications/Notifications.cs
@@ -23,6 +23,7 @@ using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Threading;
+using MediaBrowser.Model.Dto;
namespace Emby.Server.Implementations.Notifications
{
@@ -260,7 +261,7 @@ namespace Emby.Server.Implementations.Notifications
var item = e.MediaInfo;
- if ( item.IsThemeMedia)
+ if (e.Item != null && e.Item.IsThemeMedia)
{
// Don't report theme song or local trailer playback
return;
@@ -430,7 +431,7 @@ namespace Emby.Server.Implementations.Notifications
return name;
}
- public static string GetItemName(BaseItemInfo item)
+ public static string GetItemName(BaseItemDto item)
{
var name = item.Name;