From f72b68298f8b8c7131457f649e2bfd1602fab084 Mon Sep 17 00:00:00 2001
From: Johnny McQuade <jfmcquade@hotmail.com>
Date: Wed, 18 Sep 2024 16:08:36 +0100
Subject: [PATCH] fix: handle skin change

---
 src/app/shared/services/skin/skin.service.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/services/skin/skin.service.ts b/src/app/shared/services/skin/skin.service.ts
index 665ae5722..df0c5c24b 100644
--- a/src/app/shared/services/skin/skin.service.ts
+++ b/src/app/shared/services/skin/skin.service.ts
@@ -7,6 +7,7 @@ import { AppConfigService } from "../app-config/app-config.service";
 import { TemplateService } from "../../components/template/services/template.service";
 import { ThemeService } from "src/app/feature/theme/services/theme.service";
 import { SyncServiceBase } from "../syncService.base";
+import { DeploymentService } from "../deployment/deployment.service";
 
 @Injectable({
   providedIn: "root",
@@ -19,8 +20,9 @@ export class SkinService extends SyncServiceBase {
   private revertOverride: RecursivePartial<IAppConfig> = {};
 
   constructor(
-    private localStorageService: LocalStorageService,
     private appConfigService: AppConfigService,
+    private deploymentService: DeploymentService,
+    private localStorageService: LocalStorageService,
     private templateService: TemplateService,
     private themeService: ThemeService
   ) {
@@ -81,7 +83,7 @@ export class SkinService extends SyncServiceBase {
    */
   private generateOverrideConfig(skin: IAppSkin) {
     // Merge onto new object to avoid changing stored revertOverride
-    const base: RecursivePartial<IAppConfig> = {};
+    const base: RecursivePartial<IAppConfig> = this.deploymentService.config.app_config || {};
     return deepMergeObjects(base, this.revertOverride, skin.appConfig);
   }