Merge branch 'release/2.1.0'

4 files changed, 18 insertions, 2 deletions

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index cdcbcb528..3997ce6db 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -159,8 +159,11 @@ export class ServerService {
     if (!this.configObservable) {
       this.configObservable = this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
                                   .pipe(
-                                    tap(this.saveConfigLocally),
-                                    tap(() => this.configLoaded = true),
+                                    tap(config => this.saveConfigLocally(config)),
+                                    tap(config => {
+                                      this.config = config
+                                      this.configLoaded = true
+                                    }),
                                     tap(() => {
                                       if (this.configReset) {
                                         this.configReloaded.next()
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 2963d4d19..b05173751 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -254,6 +254,10 @@ menu {
 @media screen and (max-width: $mobile-view) {
   .menu-wrapper {
     width: 100% !important;
+
+    menu {
+      overflow-y: auto;
+    }
   }
 
   .top-menu, .footer {
diff --git a/client/src/app/shared/video-playlist/video-playlist.service.ts b/client/src/app/shared/video-playlist/video-playlist.service.ts
index bae6f9e04..38d915c6b 100644
--- a/client/src/app/shared/video-playlist/video-playlist.service.ts
+++ b/client/src/app/shared/video-playlist/video-playlist.service.ts
@@ -141,6 +141,8 @@ export class VideoPlaylistService {
     return this.authHttp.post<{ videoPlaylist: { id: number } }>(VideoPlaylistService.BASE_VIDEO_PLAYLIST_URL, data)
                .pipe(
                  tap(res => {
+                   if (!this.myAccountPlaylistCache) return
+
                    this.myAccountPlaylistCache.total++
 
                    this.myAccountPlaylistCache.data.push({
@@ -161,6 +163,8 @@ export class VideoPlaylistService {
                .pipe(
                  map(this.restExtractor.extractDataBool),
                  tap(() => {
+                   if (!this.myAccountPlaylistCache) return
+
                    const playlist = this.myAccountPlaylistCache.data.find(p => p.id === videoPlaylist.id)
                    playlist.displayName = body.displayName
 
@@ -175,6 +179,8 @@ export class VideoPlaylistService {
                .pipe(
                  map(this.restExtractor.extractDataBool),
                  tap(() => {
+                   if (!this.myAccountPlaylistCache) return
+
                    this.myAccountPlaylistCache.total--
                    this.myAccountPlaylistCache.data = this.myAccountPlaylistCache.data
                                                           .filter(p => p.id !== videoPlaylist.id)
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index c91ae08b9..5213443fc 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -262,6 +262,9 @@ export class PeerTubeEmbed {
 
   private async buildDock (videoInfo: VideoDetails, configResponse: Response) {
     if (this.controls) {
+      // 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()