Fix default trending algorithm in admin config

2 files changed, 8 insertions, 5 deletions

diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index e239c6210..1120e6165 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -31,12 +31,15 @@ export class RedirectService {
     private serverService: ServerService,
     private storage: SessionStorageService
   ) {
-    // The config is first loaded from the cache so try to get the default route
+
+  }
+
+  init () {
     const config = this.serverService.getHTMLConfig()
-    if (config?.instance?.defaultClientRoute) {
+    if (config.instance.defaultClientRoute) {
       this.defaultRoute = config.instance.defaultClientRoute
     }
-    if (config?.trending?.videos?.algorithms?.default) {
+    if (config.trending.videos.algorithms.default) {
       this.defaultTrendingAlgorithm = config.trending.videos.algorithms.default
     }
 
@@ -47,7 +50,7 @@ export class RedirectService {
 
     // Track previous url
     this.currentUrl = this.router.url
-    router.events.subscribe(event => {
+    this.router.events.subscribe(event => {
       if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
         if ([ '/401', '/404' ].includes(event.url)) return
 
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 9db455cb8..0829d87d5 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -40,7 +40,7 @@ export class ServerService {
 
   loadHTMLConfig () {
     try {
-      return this.loadHTMLConfigLocally()
+      this.loadHTMLConfigLocally()
     } catch (err) {
       // Expected in dev mode since we can't inject the config in the HTML
       if (environment.production !== false) {