diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-02-03 22:34:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 22:34:40 -0500 |
| commit | 20033f2275361ed4d46df77da0694f8f7dc3f04f (patch) | |
| tree | 958ec85809d478ad3088d101365f1695e6ba617f /Emby.Server.Implementations/LiveTv | |
| parent | be89d53a9e16e16f434c35e22814f1d9fe3fc16d (diff) | |
| parent | c4c0894b29898ab6826542abc7a247291b46f804 (diff) | |
Merge branch 'master' into fix-env
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index bce9c240d5..c5ab568ae3 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -123,7 +123,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV } } - public async void Start() + public async Task Start() { _timerProvider.RestartTimers(); diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs index 982a54b68d..9c9ba09f5f 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs @@ -1,12 +1,13 @@ +using System.Threading.Tasks; using MediaBrowser.Controller.Plugins; namespace Emby.Server.Implementations.LiveTv.EmbyTV { public class EntryPoint : IServerEntryPoint { - public void Run() + public Task RunAsync() { - EmbyTV.Current.Start(); + return EmbyTV.Current.Start(); } public void Dispose() |