From fa1d270a2f6572575237ff24db114545867bb3ef Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 5 Sep 2021 23:15:04 +0300
Subject: [PATCH 1/2] Show error if player not found

---
 src/components/playback/playbackmanager.js | 13 ++++++++++++-
 src/strings/en-us.json                     |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 615e775ce9..18254ac267 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2153,7 +2153,7 @@ class PlaybackManager {
             }, onInterceptorRejection);
         }
 
-        function onInterceptorRejection() {
+        function cancelPlayback() {
             const player = self._currentPlayer;
 
             if (player) {
@@ -2162,7 +2162,10 @@ class PlaybackManager {
             }
 
             Events.trigger(self, 'playbackcancelled');
+        }
 
+        function onInterceptorRejection() {
+            cancelPlayback();
             return Promise.reject();
         }
 
@@ -2238,6 +2241,14 @@ class PlaybackManager {
                 promise = Promise.resolve();
             }
 
+            if (!player) {
+                return promise.then(() => {
+                    cancelPlayback();
+                    loading.hide();
+                    showPlaybackInfoErrorMessage(self, 'ErrorPlayerNotFound');
+                });
+            }
+
             if (!isServerItem(item) || item.MediaType === 'Book') {
                 return promise.then(function () {
                     const streamInfo = createStreamInfoFromUrlItem(item);
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 2684ddb46a..87ea463c28 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -243,6 +243,7 @@
     "ErrorDefault": "There was an error processing the request. Please try again later.",
     "ErrorDeletingItem": "There was an error deleting the item from the server. Please check that Jellyfin has write access to the media folder and try again.",
     "ErrorGettingTvLineups": "There was an error downloading TV lineups. Please ensure your information is correct and try again.",
+    "ErrorPlayerNotFound": "No player found for the requested media.",
     "ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.",
     "ErrorSavingTvProvider": "There was an error saving the TV provider. Please ensure it is accessible and try again.",
     "ErrorStartHourGreaterThanEnd": "End time must be greater than the start time.",

From ae2e1ef836d8fb98e30fb4eb9920d1286cc5ecf2 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Mon, 6 Sep 2021 18:45:52 +0300
Subject: [PATCH 2/2] Print error

---
 src/components/playback/playbackmanager.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 18254ac267..cc449ea30f 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2245,6 +2245,7 @@ class PlaybackManager {
                 return promise.then(() => {
                     cancelPlayback();
                     loading.hide();
+                    console.error(`No player found for the requested media: ${item.Url}`);
                     showPlaybackInfoErrorMessage(self, 'ErrorPlayerNotFound');
                 });
             }