From 7792c476564d5b2cf15d025f12ec8e80280bdc51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Sat, 11 May 2019 09:34:00 +0200
Subject: [PATCH] Fixed projector logo

---
 .../app/shared/components/projector/projector.component.html  | 2 +-
 .../app/shared/components/projector/projector.component.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/app/shared/components/projector/projector.component.html b/client/src/app/shared/components/projector/projector.component.html
index a74167b73..a186e4bcf 100644
--- a/client/src/app/shared/components/projector/projector.component.html
+++ b/client/src/app/shared/components/projector/projector.component.html
@@ -7,7 +7,7 @@
         </div>
         <div id="header" [ngStyle]="headerFooterStyle" *ngIf="projector && projector.show_header_footer">
             <!-- projector logo -->
-            <img *ngIf="enableLogo && projectorLogo" src="{{ projectorLogo }}" class="projector-logo-main" />
+            <img *ngIf="projector.show_logo && projectorLogo" src="{{ projectorLogo }}" class="projector-logo-main" />
 
             <div *ngIf="projector.show_title" id="eventdata">
                 <div
diff --git a/client/src/app/shared/components/projector/projector.component.ts b/client/src/app/shared/components/projector/projector.component.ts
index 63f4facec..78239c16c 100644
--- a/client/src/app/shared/components/projector/projector.component.ts
+++ b/client/src/app/shared/components/projector/projector.component.ts
@@ -140,7 +140,6 @@ export class ProjectorComponent extends BaseComponent implements OnDestroy {
     // Some settings for the view from the config.
     public enableHeaderAndFooter = true;
     public enableTitle = true;
-    public enableLogo = true;
     public projectorLogo;
     public eventName;
     public eventDescription;
@@ -166,10 +165,11 @@ export class ProjectorComponent extends BaseComponent implements OnDestroy {
     ) {
         super(titleService, translate);
         // projector logo / background-image
-        this.configService.get<boolean>('projector_enable_logo').subscribe(val => (this.enableLogo = val));
         this.configService.get<{ path?: string }>('logo_projector_main').subscribe(val => {
             if (val && val.path) {
                 this.projectorLogo = val.path;
+            } else {
+                this.projectorLogo = '';
             }
         });
         this.configService.get<{ path?: string }>('logo_projector_header').subscribe(val => {