Merge branch 'release/2.1.0' into develop

2 files changed, 7 insertions, 8 deletions

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index dec045928..40c9a2b25 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -255,17 +255,13 @@ menu {
 @media screen and (max-width: $mobile-view) {
   .menu-wrapper {
     width: 100% !important;
-  }
-
-  .top-menu, .footer {
-    width: 100% !important;
-  }
-}
 
-@media (hover: none) and (pointer: coarse) {
-  .menu-wrapper {
     menu {
       overflow-y: auto;
     }
   }
+
+  .top-menu, .footer {
+    width: 100% !important;
+  }
 }
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index d5b42a025..e3bcbc010 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -263,6 +263,9 @@ export class PeerTubeEmbed {
   private async buildDock (videoInfo: VideoDetails, configResponse: Response) {
     if (!this.controls) return
 
+    // On webtorrent fallback, player may have been disposed
+    if (!this.player.player_) return
+
     const title = this.title ? videoInfo.name : undefined
 
     const config: ServerConfig = await configResponse.json()