aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2024-06-30 23:30:24 +0200
committerGitHub <noreply@github.com>2024-06-30 23:30:24 +0200
commit6225b92da092b378988f497ab8091c4820c49be8 (patch)
tree4f7664f7a45609791b24482017caf8fe488304a0
parent64b6805ec3854057337d438c223ccb208d41d892 (diff)
parentc46a50ace9308297e4f17fc002d94a78cb1d7e0c (diff)
Merge pull request #12185 from crobibero/live-tv-conflict-exception
Add messages to LiveTvConflict exception
-rw-r--r--MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs4
-rw-r--r--src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs2
-rw-r--r--src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs2
3 files changed, 2 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs b/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs
index 881c42c73..3a062a467 100644
--- 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
index afc2e4f9c..aba9627ba 100644
--- a/src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs
@@ -219,7 +219,7 @@ namespace Jellyfin.LiveTv.TunerHosts
}
}
- 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
index 861338727..1dd35da41 100644
--- a/src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -145,7 +145,7 @@ namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
}
_activeTuner = -1;
- throw new LiveTvConflictException();
+ throw new LiveTvConflictException("No tuners available");
}
public async Task ChangeChannel(IHdHomerunChannelCommands commands, CancellationToken cancellationToken)