diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-09 15:27:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 15:27:29 -0400 |
| commit | 1b0f6f6c56ee82fee149c26518284ac994394270 (patch) | |
| tree | 118bda4b0be57add2228d7e2d1ebf40b94999bf5 /Emby.Server.Implementations/Activity | |
| parent | 9cb197d5112eadfc6ce80163aa79bb968ed2d554 (diff) | |
| parent | 15ee918ac60c3c9b35ca7ea7a1eca4396493f142 (diff) | |
Merge pull request #2695 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Activity')
| -rw-r--r-- | Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs index d3b2ef7ef..567f139fd 100644 --- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs +++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs @@ -123,7 +123,7 @@ namespace Emby.Server.Implementations.Activity return; } - if (item.IsThemeMedia) + if (e.Item != null && e.Item.IsThemeMedia) { // Don't report theme song or local trailer playback return; @@ -155,7 +155,7 @@ namespace Emby.Server.Implementations.Activity return; } - if (item.IsThemeMedia) + if (e.Item != null && e.Item.IsThemeMedia) { // Don't report theme song or local trailer playback return; |