From 7c93905d14bf7d86d04dbbffc6e6a510c852f360 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 13 Dec 2019 09:32:36 +0100 Subject: Fix theme loading --- client/src/app/core/theme/theme.service.ts | 2 ++ client/src/app/videos/+video-watch/video-watch.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts index 9be8e7a2d..3eebc1acc 100644 --- a/client/src/app/core/theme/theme.service.ts +++ b/client/src/app/core/theme/theme.service.ts @@ -5,6 +5,7 @@ import { environment } from '../../../environments/environment' import { PluginService } from '@app/core/plugins/plugin.service' import { ServerConfigTheme } from '@shared/models' import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage' +import { first } from 'rxjs/operators' @Injectable() export class ThemeService { @@ -123,6 +124,7 @@ export class ThemeService { } this.auth.userInformationLoaded + .pipe(first()) .subscribe(() => this.updateCurrentTheme()) } diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 8378e83b8..12b74a846 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -279,14 +279,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy { isAutoPlayEnabled () { return ( - this.user && this.user.autoPlayNextVideo || + (this.user && this.user.autoPlayNextVideo) || peertubeSessionStorage.getItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true' ) } isPlaylistAutoPlayEnabled () { return ( - this.user && this.user.autoPlayNextVideoPlaylist || + (this.user && this.user.autoPlayNextVideoPlaylist) || peertubeSessionStorage.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true' ) } -- cgit v1.2.3