From 0b088c598e8bfea7bd9c822b677bbd042723c309 Mon Sep 17 00:00:00 2001 From: elexis Date: Thu, 5 Apr 2018 11:57:43 +0000 Subject: [PATCH] Fix undefined warning when pressing the massbarter hotkey after building a market before selecting the market for the first time following rP21657. Reported By: nani, (-_-) git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@21664 3db68df2-c116-0410-a063-a993310a9797 --- binaries/data/mods/public/gui/session/menu.js | 7 +++++-- binaries/data/mods/public/gui/session/session.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js index b44f87989d..06bb16c03a 100644 --- a/binaries/data/mods/public/gui/session/menu.js +++ b/binaries/data/mods/public/gui/session/menu.js @@ -763,6 +763,11 @@ function updateTraderTexts() Engine.GetGUIObjectByName("traderCountText").caption = getIdleLandTradersText(traderNumber) + "\n\n" + getIdleShipTradersText(traderNumber); } +function initBarterButtons() +{ + g_BarterSell = g_ResourceData.GetCodes()[0]; +} + /** * Code common to both the Barter Panel and the Trade/Barter Dialog, that * only needs to be run when the panel or dialog is opened by the player. @@ -773,8 +778,6 @@ function updateTraderTexts() */ function barterOpenCommon(resourceCode, idx, prefix) { - g_BarterSell = g_BarterSell || g_ResourceData.GetCodes()[0]; - let barterButton = {}; for (let action of g_BarterActions) barterButton[action] = Engine.GetGUIObjectByName(prefix + action + "Button[" + idx + "]"); diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js index 892ffcecf1..ed9f32ba4b 100644 --- a/binaries/data/mods/public/gui/session/session.js +++ b/binaries/data/mods/public/gui/session/session.js @@ -305,6 +305,7 @@ function initGUIObjects() updateGameSpeedControl(); resizeDiplomacyDialog(); resizeTradeDialog(); + initBarterButtons(); initPanelEntities(); initViewedPlayerDropdown(); initChatWindow(); -- 2.11.4.GIT