From 01dc8c3d72108861d386b1b02b74d1cb75530d4f Mon Sep 17 00:00:00 2001 From: Matei Date: Sat, 12 Jul 2008 07:11:27 +0000 Subject: [PATCH] Fix an annoying error message when some properties of templates were not defined. This was SVN commit r6212. --- .../gui/test/functions_page_session_status_commands.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js b/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js index 26c6ed38cd..8a7a0b3bc9 100644 --- a/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js +++ b/binaries/data/mods/official/gui/test/functions_page_session_status_commands.js @@ -463,13 +463,15 @@ function updateTab (tab, type, cellSheet, attribute, attribute2, arrayCells) Crd[getCrd (listObject.name, true)].entity = new Object(itemName); // Set tooltip. - listObject.tooltip = getEntityTemplate(itemName).traits.id.civ + " " + getEntityTemplate(itemName).traits.id.generic; + var template = getEntityTemplate(itemName); + if (!template) break; + listObject.tooltip = template.traits.id.civ + " " + template.traits.id.generic; // Set portrait. setPortrait (listObject.name, - getEntityTemplate(itemName).traits.id.icon, + template.traits.id.icon, "Button" + toTitleCase(selection[0].traits.id.civ_code), - getEntityTemplate(itemName).traits.id.icon_cell); + template.traits.id.icon_cell); break; }