From 481e62a6e0b6e3a32e620aefbaa091018d71b73f Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Mon, 30 Nov 2020 11:38:51 -0500
Subject: [PATCH 1/2] Add check that an item can be played before playing via
 default action

---
 src/components/shortcuts.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js
index fe7bfefc90..978fa15814 100644
--- a/src/components/shortcuts.js
+++ b/src/components/shortcuts.js
@@ -204,11 +204,15 @@ import toast from './toast/toast';
         } else if (action === 'play' || action === 'resume') {
             const startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
 
-            playbackManager.play({
-                ids: [playableItemId],
-                startPositionTicks: startPositionTicks,
-                serverId: serverId
-            });
+            if (playbackManager.canPlay(item)) {
+                playbackManager.play({
+                    ids: [playableItemId],
+                    startPositionTicks: startPositionTicks,
+                    serverId: serverId
+                });
+            } else {
+                console.warn('Unable to play item', item);
+            }
         } else if (action === 'queue') {
             if (playbackManager.isPlaying()) {
                 playbackManager.queue({

From db6391c6c130839f96463459b5eece236ee77339 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Mon, 30 Nov 2020 11:50:00 -0500
Subject: [PATCH 2/2] Fix dynamic plugin import

---
 src/components/pluginManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js
index c944340a44..9fe44ab439 100644
--- a/src/components/pluginManager.js
+++ b/src/components/pluginManager.js
@@ -89,7 +89,8 @@ import { playbackManager } from './playback/playbackmanager';
                     });
                 } else {
                     console.debug(`Loading plugin (via dynamic import): ${pluginSpec}`);
-                    plugin = await import(/* webpackChunkName: "[request]" */ `../plugins/${pluginSpec}`);
+                    const pluginResult = await import(/* webpackChunkName: "[request]" */ `../plugins/${pluginSpec}`);
+                    plugin = new pluginResult.default;
                 }
             } else if (pluginSpec.then) {
                 console.debug('Loading plugin (via promise/async function)');