4 files changed, 10 insertions, 4 deletions

diff --git a/client/src/assets/player/shared/settings/resolution-menu-button.ts b/client/src/assets/player/shared/settings/resolution-menu-button.ts
index 8bd5b4f03..a0b349f67 100644
--- a/client/src/assets/player/shared/settings/resolution-menu-button.ts
+++ b/client/src/assets/player/shared/settings/resolution-menu-button.ts
@@ -68,7 +68,8 @@ class ResolutionMenuButton extends MenuButton {
       this.menu.addChild(new ResolutionMenuItem(
         this.player_,
         {
-          id: d.id,
+          id: d.id + '',
+          resolutionId: d.id,
           label,
           selected: d.selected
         })
diff --git a/client/src/assets/player/shared/settings/resolution-menu-item.ts b/client/src/assets/player/shared/settings/resolution-menu-item.ts
index 6047f52f7..678eb368b 100644
--- a/client/src/assets/player/shared/settings/resolution-menu-item.ts
+++ b/client/src/assets/player/shared/settings/resolution-menu-item.ts
@@ -3,7 +3,7 @@ import videojs from 'video.js'
 const MenuItem = videojs.getComponent('MenuItem')
 
 export interface ResolutionMenuItemOptions extends videojs.MenuItemOptions {
-  id: number
+  resolutionId: number
 }
 
 class ResolutionMenuItem extends MenuItem {
@@ -21,7 +21,7 @@ class ResolutionMenuItem extends MenuItem {
     this.autoResolutionEnabled = true
     this.autoResolutionChosen = ''
 
-    this.resolutionId = options.id
+    this.resolutionId = options.resolutionId
     this.label = options.label
 
     player.peertubeResolutions().on('resolutionChanged', () => this.updateSelection())
diff --git a/client/src/assets/player/shared/settings/settings-menu-item.ts b/client/src/assets/player/shared/settings/settings-menu-item.ts
index 8d1819a2d..07ff0f2a8 100644
--- a/client/src/assets/player/shared/settings/settings-menu-item.ts
+++ b/client/src/assets/player/shared/settings/settings-menu-item.ts
@@ -301,7 +301,7 @@ class SettingsMenuItem extends MenuItem {
         this.settingsSubMenuValueEl_.innerHTML = html
       }, 250)
     } else {
-      // Loop trough the submenu items to find the selected child
+      // Loop through the submenu items to find the selected child
       for (const subMenuItem of this.subMenu.menu.children_) {
         if (!(subMenuItem instanceof component)) {
           continue
diff --git a/client/src/assets/player/shared/webtorrent/webtorrent-plugin.ts b/client/src/assets/player/shared/webtorrent/webtorrent-plugin.ts
index b48203148..83b483d87 100644
--- a/client/src/assets/player/shared/webtorrent/webtorrent-plugin.ts
+++ b/client/src/assets/player/shared/webtorrent/webtorrent-plugin.ts
@@ -430,6 +430,11 @@ class WebTorrentPlugin extends Plugin {
   private initializePlayer () {
     this.buildQualities()
 
+    if (this.videoFiles.length === 0) {
+      this.player.addClass('disabled')
+      return
+    }
+
     if (this.autoplay) {
       this.player.posterImage.hide()