X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Frouting%2Fredirect.service.ts;h=17d9d1358b3a0db443a0f6b5a06eba3102cabfec;hb=fc21ef5c62d845576a916414468b3a57370a57b2;hp=cf690a4d06ecc86851d7edaa6749901f28981788;hpb=819b656439e5f0ec2ae5de9357502cdfe3196197;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index cf690a4d0..17d9d1358 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -20,24 +20,14 @@ export class RedirectService {
     private serverService: ServerService
   ) {
     // The config is first loaded from the cache so try to get the default route
-    const tmpConfig = this.serverService.getTmpConfig()
-    if (tmpConfig?.instance?.defaultClientRoute) {
-      this.defaultRoute = tmpConfig.instance.defaultClientRoute
+    const config = this.serverService.getHTMLConfig()
+    if (config?.instance?.defaultClientRoute) {
+      this.defaultRoute = config.instance.defaultClientRoute
     }
-    if (tmpConfig?.trending?.videos?.algorithms?.default) {
-      this.defaultTrendingAlgorithm = tmpConfig.trending.videos.algorithms.default
+    if (config?.trending?.videos?.algorithms?.default) {
+      this.defaultTrendingAlgorithm = config.trending.videos.algorithms.default
     }
 
-    // Load default route
-    this.serverService.getConfig()
-        .subscribe(config => {
-          const defaultRouteConfig = config.instance.defaultClientRoute
-          const defaultTrendingConfig = config.trending.videos.algorithms.default
-
-          if (defaultRouteConfig) this.defaultRoute = defaultRouteConfig
-          if (defaultTrendingConfig) this.defaultTrendingAlgorithm = defaultTrendingConfig
-        })
-
     // Track previous url
     this.currentUrl = this.router.url
     router.events.subscribe(event => {