Merge pull request jellyfin#12185 from crobibero/live-tv-conflict-exc…

…eption Add messages to LiveTvConflict exception
nathangur · Jun 30, 2024 · 6225b92 · 6225b92
2 parents 64b6805 + c46a50a
commit 6225b92
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs b/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs
@@ -9,10 +9,6 @@ namespace MediaBrowser.Controller.LiveTv
     /// </summary>
     public class LiveTvConflictException : Exception
     {
-        public LiveTvConflictException()
-        {
-        }
-
         public LiveTvConflictException(string message)
             : base(message)
         {

diff --git a/src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs b/src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs
@@ -219,7 +219,7 @@ public async Task<ILiveStream> GetChannelStream(string channelId, string streamI
                 }
             }
 
-            throw new LiveTvConflictException();
+            throw new LiveTvConflictException("Unable to find host to play channel");
         }
 
         protected virtual bool IsValidChannelId(string channelId)

diff --git a/src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -145,7 +145,7 @@ public async Task StartStreaming(IPAddress remoteIP, IPAddress localIP, int loca
             }
 
             _activeTuner = -1;
-            throw new LiveTvConflictException();
+            throw new LiveTvConflictException("No tuners available");
         }
 
         public async Task ChangeChannel(IHdHomerunChannelCommands commands, CancellationToken cancellationToken)