From eae5840b0ef041c4c159bb4d33fa7c46e3573d4e Mon Sep 17 00:00:00 2001 From: Freagarach Date: Thu, 12 Jan 2023 10:34:53 +0000 Subject: [PATCH] Fix structure tree/civinfo with empty civ history. Since the history string is optional, don't fail without it. Based on a patch by: @Silier Fixes #6651 This was SVN commit r27427. --- .../data/mods/public/gui/reference/civinfo/CivInfoPage.js | 3 --- .../gui/reference/civinfo/Sections/HistorySection.js | 7 +++++++ .../mods/public/gui/reference/structree/StructreePage.js | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js index 4e70afb4c6..1705cc2d7e 100644 --- a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js +++ b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js @@ -39,10 +39,7 @@ class CivInfoPage extends ReferencePage if(!civInfo) error(sprintf("Error loading civ data for \"%(code)s\"", { "code": civCode })); - // Update civ gameplay display this.gameplaySection.update(this.activeCiv, civInfo); - - // Update civ history display this.historySection.update(civInfo); } diff --git a/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js b/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js index 35f5326423..5e9abdcec2 100644 --- a/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js +++ b/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.js @@ -9,6 +9,13 @@ class HistorySection update(civInfo) { + if (!civInfo.History) + { + this.CivHistoryHeading.caption = ""; + this.CivHistoryText.caption = ""; + return; + } + this.CivHistoryHeading.caption = this.page.formatHeading( sprintf(this.headingCaption, { "civilization": civInfo.Name }), diff --git a/binaries/data/mods/public/gui/reference/structree/StructreePage.js b/binaries/data/mods/public/gui/reference/structree/StructreePage.js index d5b18984e4..e19edcbfb2 100644 --- a/binaries/data/mods/public/gui/reference/structree/StructreePage.js +++ b/binaries/data/mods/public/gui/reference/structree/StructreePage.js @@ -48,7 +48,7 @@ class StructreePage extends ReferencePage this.CivEmblem.sprite = "stretched:" + this.civData[this.activeCiv].Emblem; this.CivName.caption = this.civData[this.activeCiv].Name; - this.CivHistory.caption = this.civData[this.activeCiv].History; + this.CivHistory.caption = this.civData[this.activeCiv].History || ""; let templateLists = this.TemplateLister.getTemplateLists(this.activeCiv); this.TreeSection.draw(templateLists.structures, this.activeCiv);