1 files changed, 21 insertions, 0 deletions

diff --git a/client/src/assets/player/resolution-menu-item.ts b/client/src/assets/player/resolution-menu-item.ts
index 8ad834c59..4b1ed0642 100644
--- a/client/src/assets/player/resolution-menu-item.ts
+++ b/client/src/assets/player/resolution-menu-item.ts
@@ -14,17 +14,38 @@ class ResolutionMenuItem extends MenuItem {
     this.id = options.id
 
     player.peertube().on('videoFileUpdate', () => this.updateSelection())
+    player.peertube().on('autoResolutionUpdate', () => this.updateSelection())
   }
 
   handleClick (event) {
     super.handleClick(event)
 
+    // Auto resolution
+    if (this.id === -1) {
+      this.player_.peertube().enableAutoResolution()
+      return
+    }
+
+    this.player_.peertube().disableAutoResolution()
     this.player_.peertube().updateResolution(this.id)
   }
 
   updateSelection () {
+    if (this.player_.peertube().isAutoResolutionOn()) {
+      this.selected(this.id === -1)
+      return
+    }
+
     this.selected(this.player_.peertube().getCurrentResolutionId() === this.id)
   }
+
+  getLabel () {
+    if (this.id === -1) {
+      return this.label + ' <small>' + this.player_.peertube().getCurrentResolutionLabel() + '</small>'
+    }
+
+    return this.label
+  }
 }
 MenuItem.registerComponent('ResolutionMenuItem', ResolutionMenuItem)