From f7a2c3d02c3268cedbf074abbcd463c92125b245 Mon Sep 17 00:00:00 2001 From: elexis Date: Tue, 28 Mar 2017 23:36:55 +0000 Subject: [PATCH] Fix a934dfad5f, add an early return when pressing the massbarter hotkey in observermode. Differential Revision: https://code.wildfiregames.com/D273 Reviewed By: user1 This was SVN commit r19358. --- binaries/data/mods/public/gui/session/menu.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js index ce2c22db0c..92cc1449e4 100644 --- a/binaries/data/mods/public/gui/session/menu.js +++ b/binaries/data/mods/public/gui/session/menu.js @@ -793,7 +793,11 @@ function barterUpdateCommon(resourceCode, idx, prefix, player) function updateBarterButtons() { - let canBarter = GetSimState().players[g_ViewedPlayer].canBarter; + let playerState = GetSimState().players[g_ViewedPlayer]; + if (!playerState) + return; + + let canBarter = playerState.canBarter; Engine.GetGUIObjectByName("barterNoMarketsMessage").hidden = canBarter; Engine.GetGUIObjectByName("barterResources").hidden = !canBarter; Engine.GetGUIObjectByName("barterHelp").hidden = !canBarter;