From d3d3843cff4e79503afd4c5d5871003cd02af52a Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Sun, 27 Sep 2020 00:38:41 +0200
Subject: [PATCH] Fix sharescreen: display correct background layer

---
 UI/ShareScreen.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UI/ShareScreen.ts b/UI/ShareScreen.ts
index 690eef5..638c830 100644
--- a/UI/ShareScreen.ts
+++ b/UI/ShareScreen.ts
@@ -65,7 +65,7 @@ export class ShareScreen extends UIElement {
 
             const currentLayer: UIEventSource<{ id: string, name: string, layer: any }> = (State.state.bm as Basemap).CurrentLayer;
             const currentBackground = new VariableUiElement(currentLayer.map(layer => {
-                return tr.fsIncludeCurrentBackgroundMap.Subs({name: layer?.id ?? ""}).Render();
+                return tr.fsIncludeCurrentBackgroundMap.Subs({name: layer?.name ?? ""}).Render();
             }));
             const includeCurrentBackground = new CheckBox(
                 new Combine([Img.checkmark, currentBackground]),
@@ -163,12 +163,12 @@ export class ShareScreen extends UIElement {
         }, optionParts);
 
 
-        this.iframe = url.map(url => `&lt;iframe src="${url}" width="100%" height="100%" title="${layout.title?.InnerRender()??""} with MapComplete"&gt;&lt;/iframe&gt`);
+        this.iframe = url.map(url => `&lt;iframe src="${url}" width="100%" height="100%" title="${layout.title?.InnerRender()??"MapComplete"} with MapComplete"&gt;&lt;/iframe&gt`);
         
         this._iframeCode = new VariableUiElement(
             url.map((url) => {
                 return `<span class='literal-code iframe-code-block'>
-                         &lt;iframe src="${url}" width="100%" height="100%" title="${layout.title.InnerRender()} with MapComplete"&gt;&lt;/iframe&gt 
+                         &lt;iframe src="${url}" width="100%" height="100%" title="${layout.title?.InnerRender() ?? "MapComplete"} with MapComplete"&gt;&lt;/iframe&gt 
                     </span>`
             })
         );