1 files changed, 12 insertions, 13 deletions

diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index a4ffbd2fe..b597a935a 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -22,7 +22,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
@@ -144,13 +143,13 @@ namespace Emby.Server.Implementations.LiveTv
         {
             var timerId = e.Argument;
 
-            EventHelper.FireEventIfNotNull(TimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+            TimerCancelled?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     Id = timerId
                 }
-            }, _logger);
+            });
         }
 
         private void EmbyTv_TimerCreated(object sender, GenericEventArgs<TimerInfo> e)
@@ -158,14 +157,14 @@ namespace Emby.Server.Implementations.LiveTv
             var timer = e.Argument;
             var service = sender as ILiveTvService;
 
-            EventHelper.FireEventIfNotNull(TimerCreated, this, new GenericEventArgs<TimerEventInfo>
+            TimerCreated?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     ProgramId = _tvDtoService.GetInternalProgramId(timer.ProgramId),
                     Id = timer.Id
                 }
-            }, _logger);
+            });
         }
 
         public ITunerHost[] TunerHosts
@@ -1734,13 +1733,13 @@ namespace Emby.Server.Implementations.LiveTv
 
             if (!(service is EmbyTV.EmbyTV))
             {
-                EventHelper.FireEventIfNotNull(TimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+                TimerCancelled?.Invoke(this, new GenericEventArgs<TimerEventInfo>
                 {
                     Argument = new TimerEventInfo
                     {
                         Id = id
                     }
-                }, _logger);
+                });
             }
         }
 
@@ -1757,13 +1756,13 @@ namespace Emby.Server.Implementations.LiveTv
 
             await service.CancelSeriesTimerAsync(timer.ExternalId, CancellationToken.None).ConfigureAwait(false);
 
-            EventHelper.FireEventIfNotNull(SeriesTimerCancelled, this, new GenericEventArgs<TimerEventInfo>
+            SeriesTimerCancelled?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     Id = id
                 }
-            }, _logger);
+            });
         }
 
         public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken)
@@ -2083,14 +2082,14 @@ namespace Emby.Server.Implementations.LiveTv
 
             if (!(service is EmbyTV.EmbyTV))
             {
-                EventHelper.FireEventIfNotNull(TimerCreated, this, new GenericEventArgs<TimerEventInfo>
+                TimerCreated?.Invoke(this, new GenericEventArgs<TimerEventInfo>
                 {
                     Argument = new TimerEventInfo
                     {
                         ProgramId = _tvDtoService.GetInternalProgramId(info.ProgramId),
                         Id = newTimerId
                     }
-                }, _logger);
+                });
             }
         }
 
@@ -2123,14 +2122,14 @@ namespace Emby.Server.Implementations.LiveTv
                 await service.CreateSeriesTimerAsync(info, cancellationToken).ConfigureAwait(false);
             }
 
-            EventHelper.FireEventIfNotNull(SeriesTimerCreated, this, new GenericEventArgs<TimerEventInfo>
+            SeriesTimerCreated?.Invoke(this, new GenericEventArgs<TimerEventInfo>
             {
                 Argument = new TimerEventInfo
                 {
                     ProgramId = _tvDtoService.GetInternalProgramId(info.ProgramId),
                     Id = newTimerId
                 }
-            }, _logger);
+            });
         }
 
         public async Task UpdateTimer(TimerInfoDto timer, CancellationToken cancellationToken)