Index: ps/trunk/binaries/data/mods/public/gui/common/tab_buttons.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/tab_buttons.js	(revision 21767)
+++ ps/trunk/binaries/data/mods/public/gui/common/tab_buttons.js	(revision 21768)
@@ -1,76 +1,77 @@
 /**
  * Number of categories.
  */
 var g_TabCategoryCount;
 
 /**
  * Index of the currently visible tab, set first tab as default.
  */
 var g_TabCategorySelected = 0;
 
 /**
  * Function to be executed when selecting a tab. The new category index is passed.
  */
 var g_OnSelectTab;
 
 /**
  * Create tab buttons.
  *
  * @param {Array} categoriesData - Arrays of objects containing for every tab a (translated) label and tooltip.
  * @param {number} buttonHeight - Vertical distance between the top and bottom of a button.
  * @param {number} spacing - Vertical distance between two buttons.
  * @param {function} onPress - Function to be executed when a button is pressed, it gets the new category index passed.
  * @param {function} onSelect - Function to be executed whenever the selection changes (so also for scrolling), it gets the new category index passed.
  */
 function placeTabButtons(categoriesData, buttonHeight, spacing, onPress, onSelect)
 {
 	g_OnSelectTab = onSelect;
 	g_TabCategoryCount = categoriesData.length;
 
 	for (let category in categoriesData)
 	{
 		let button = Engine.GetGUIObjectByName("tabButton[" + category + "]");
 		if (!button)
 		{
 			warn("Too few tab-buttons!");
 			break;
 		}
 
 		button.hidden = false;
 
 		let size = button.size;
 		size.top = category * (buttonHeight + spacing) + spacing / 2;
 		size.bottom = size.top + buttonHeight;
 		button.size = size;
 		button.tooltip = categoriesData[category].tooltip || "";
 		button.onPress = (category => function() { onPress(category); })(+category);
 
 		Engine.GetGUIObjectByName("tabButtonText[" + category + "]").caption = categoriesData[category].label;
 	}
 
 	selectPanel(g_TabCategorySelected);
 }
 
 /**
  * Show next/previous panel.
  * @param direction - +1/-1 for forward/backward.
  */
 function selectNextTab(direction)
 {
 	if (g_TabCategoryCount)
 		selectPanel(g_TabCategorySelected === undefined ?
 			direction > 0 ?
 				0 :
 				g_TabCategoryCount - 1 :
 			(g_TabCategorySelected + direction + g_TabCategoryCount) % g_TabCategoryCount);
 }
 
 function selectPanel(category)
 {
 	g_TabCategorySelected = category;
 	Engine.GetGUIObjectByName("tabButtons").children.forEach((button, j) => {
 		button.sprite = category == j ? "ModernTabVerticalForeground" : "ModernTabVerticalBackground";
 	});
 
-	g_OnSelectTab(category);
+	if (g_OnSelectTab)
+		g_OnSelectTab(category);
 }
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml	(revision 21767)
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml	(revision 21768)
@@ -1,288 +1,292 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/gamesetup/"/>
 
 	<object	hotkey="civinfo">
 		<action on="Press">
 			Engine.PushGuiPage("page_civinfo.xml", { "civ": g_CivInfo.code, "callback": "storeCivInfoPage" });
 		</action>
 	</object>
 
 	<object	hotkey="structree">
 		<action on="Press">
 			Engine.PushGuiPage("page_structree.xml", { "civ": g_CivInfo.code, "callback": "storeCivInfoPage" });
 		</action>
 	</object>
 
+	<object hotkey="cancel">
+		<action on="Press">selectPanel(undefined);</action>
+	</object>
+
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">
 
 		<object style="TitleText" type="text" size="50%-128 4 50%+128 36">
 			<translatableAttribute id="caption">Match Setup</translatableAttribute>
 		</object>
 
 		<object type="image" style="ModernDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
 
 			<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
 				<translatableAttribute id="caption">Loading</translatableAttribute>
 			</object>
 
 			<object type="text" style="ModernLabelText">
 				<translatableAttribute id="caption">Loading map data. Please wait…</translatableAttribute>
 			</object>
 
 		</object>
 
 		<object hidden="true" name="setupWindow">
 
 			<action on="Tick">
 				onTick();
 			</action>
 			<!--  Keep the settings panel size fitting to the settings when resizing -->
 			<action on="WindowResized">
 				distributeSettings();
 			</action>
 
 			<!-- Player assignments -->
 			<object size="24 40 100%-440 336" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPanel">
 				<object size="0 6 100% 30">
 
 					<object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 20%+5 100%">
 						<translatableAttribute id="caption">Player Name</translatableAttribute>
 					</object>
 
 					<object name="playerColorHeading" type="text" style="ModernLabelText" size="20%+5 0 22%+45 100%">
 						<translatableAttribute id="caption">Color</translatableAttribute>
 					</object>
 
 					<object name="playerPlacementHeading" type="text" style="ModernLabelText" size="22%+45 0 50%+35 100%">
 						<translatableAttribute id="caption">Player Placement</translatableAttribute>
 					</object>
 
 					<object name="playerCivHeading" type="text" style="ModernLabelText" size="50%+69 0 85%-37 100%">
 						<translatableAttribute id="caption">Civilization</translatableAttribute>
 					</object>
 
 					<object name="civInfoButton"
 						type="button"
 						style="IconButton"
 						sprite="iconInfoGold"
 						sprite_over="iconInfoWhite"
 						size="85%-37 0 85%-21 16"
 					>
 						<action on="Press">
 							Engine.PushGuiPage(g_CivInfo.page, { "civ": g_CivInfo.code, "callback": "storeCivInfoPage" });
 						</action>
 					</object>
 
 					<object name="civResetButton"
 						type="button"
 						style="IconButton"
 						sprite="iconResetGold"
 						sprite_over="iconResetWhite"
 						size="85%-16 0 85% 16"
 					>
 						<translatableAttribute id="tooltip">Reset any civilizations that have been selected to the default (random)</translatableAttribute>
 						<action on="Press">resetCivilizations();</action>
 					</object>
 
 					<object name="playerTeamHeading" type="text" style="ModernLabelText" size="85%+5 0 100%-21 100%">
 						<translatableAttribute id="caption">Team</translatableAttribute>
 					</object>
 
 					<object name="teamResetButton"
 						type="button"
 						style="IconButton"
 						sprite="iconResetGold"
 						sprite_over="iconResetWhite"
 						size="100%-21 0 100%-5 16"
 					>
 						<translatableAttribute id="tooltip">Reset all teams to the default.</translatableAttribute>
 						<action on="Press">resetTeams();</action>
 					</object>
 				</object>
 
 				<object size="1 36 100%-1 100%">
 					<repeat count="8">
 						<object name="playerBox[n]" size="0 0 100% 32">
 							<object name="playerColor[n]" type="image" size="0 0 100% 100%"/>
 							<object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 22% 30"/>
 							<object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="22%+5 2 22%+33 30" sprite="" scrollbar="false" button_width="22" font="sans-stroke-14" tooltip_style="onscreenToolTip">
 								<translatableAttribute id="tooltip">Pick a color.</translatableAttribute>
 							</object>
 							<object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+37 2 50%+35 30" tooltip_style="onscreenToolTip">
 								<translatableAttribute id="tooltip">Select player.</translatableAttribute>
 							</object>
 							<object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="22%+5 0 50%+35 30"/>
 							<object name="playerConfig[n]" type="button" style="StoneButton" size="50%+40 4 50%+64 28"
 								tooltip_style="onscreenToolTip"
 								font="sans-bold-stroke-12"
 								sprite="ModernGear"
 								sprite_over="ModernGearHover"
 								sprite_pressed="ModernGearPressed"
 							>
 								<translatableAttribute id="tooltip">Configure AI settings.</translatableAttribute>
 							</object>
 							<object name="playerCiv[n]" type="dropdown" style="ModernDropDown" size="50%+69 2 85% 30" tooltip_style="onscreenToolTip" dropdown_size="424">
 								<translatableAttribute id="tooltip">Select player's civilization.</translatableAttribute>
 							</object>
 							<object name="playerCivText[n]" type="text" style="ModernLabelText" size="50%+65 0 85% 30"/>
 							<object name="playerTeam[n]" type="dropdown" style="ModernDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip">
 								<translatableAttribute id="tooltip">Select player's team.</translatableAttribute>
 							</object>
 							<object name="playerTeamText[n]" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%"/>
 						</object>
 					</repeat>
 				</object>
 			</object>
 
 			<!-- Singleplayer / AI tips -->
 			<object name="spTips" size="24 370 360 570" type="image" hidden="true">
 				<object size="4 10 28 34" type="image" sprite="ModernGear"/>
 				<object name="aiTips" size="32 0 100%-20 100%-32" type="text" style="ModernLeftLabelText"/>
 				<object size="30 100%-30 100% 100%-8" type="text" style="ModernLeftLabelText">
 					<translatableAttribute id="caption">Show this message in the future</translatableAttribute>
 				</object>
 				<object name="displaySPTips" size="8 100%-30 28 100%-8" type="checkbox" style="ModernTickBox">
 					<action on="Press">saveSettingAndWriteToUserConfig("gui.gamesetup.enabletips", String(this.checked));</action>
 				</object>
 			</object>
 
 			<!-- Map Preview -->
 			<object type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 40 100%-24 336">
 				<object type="image" sprite="snMapPreview" size="1 1 401 294" name="mapPreview"/>
 				<object name="mapInfoName" type="text" style="ModernLeftLabelText" size="5 100%-20 100% 100%-1"/>
 			</object>
 
 			<!-- Settings -->
 			<object name="settingsBackground" type="image" sprite="ModernDarkBoxGold" size="100%-715 346 100%-315 100%-60"/>
 			<object name="settingsPanel" type="image" sprite="ModernDarkBoxGold" size="100%-785 351 100%-315 100%-65" hidden="true" z="1">
 				<repeat count="60" var="n">
 					<object name="settingFrame[n]" size="0 2 320 32">
 						<object
 							name="settingTitle[n]"
 							type="text"
 							size="0 0 170 30"
 							style="ModernRightLabelText"
 							z="1"
 						/>
 						<object
 							name="settingText[n]"
 							type="text"
 							size="175 0 100% 30"
 							style="ModernLeftLabelText"
 							z="1"
 						/>
 						<object
 							name="settingDropdown[n]"
 							type="dropdown"
 							size="175 0 100% 30"
 							style="ModernDropDown"
 							tooltip_style="onscreenToolTip"
 							z="1"
 						/>
 						<object
 							name="settingCheckbox[n]"
 							type="checkbox"
 							size="175 5 193 30"
 							style="ModernTickBox"
 							tooltip_style="onscreenToolTip"
 							z="1"
 						/>
 					</object>
 				</repeat>
 			</object>
 
 			<!-- Re-add background to hide settings panel -->
 			<object type="image" sprite="ModernWindowCornerBottomRight" size="100%-315 346 100% 100%" z="20"/>
 
 			<!-- Category Tabs -->
 			<object name="settingTabButtonsBackground" type="image" sprite="ModernDarkBoxGold" size="100%-315 346 100%-25 556" z="21"/>
 			<object name="settingTabButtons" size="100%-315 346 100%-25 556" z="21">
 				<include file="gui/common/tab_buttons.xml"/>
 			</object>
 
 			<!-- View Lobby Button -->
 			<object name="lobbyButton"
 				type="button"
 				style="IconButton"
 				sprite="iconBubbleGold"
 				sprite_over="iconBubbleWhite"
 				size="100%-41 346 100%-25 362"
 				hotkey="lobby"
 				z="100"
 			>
 				<translatableAttribute id="tooltip">Show the multiplayer lobby in a dialog window.</translatableAttribute>
 			</object>
 
 			<!-- Map Description -->
 			<object name="mapInfoDescriptionFrame" type="image" sprite="ModernDarkBoxGold" size="100%-315 550 100%-25 100%-60" z="21">
 				<object name="mapInfoDescription" type="text" style="ModernText" size="0 0 100% 100%"/>
 			</object>
 
 			<!-- Chat window -->
 			<object name="chatPanel" size="24 346 100%-640 100%-60" type="image" sprite="ModernDarkBoxGold">
 				<object name="chatText" size="2 2 100%-2 100%-28" type="text" style="ChatPanel"/>
 
 				<object name="chatInput" size="4 100%-26 100%-96 100%-4" type="input" style="ModernInput">
 					<action on="Press">submitChatInput();</action>
 					<action on="Tab">autoCompleteNick(this, g_Autocomplete);</action>
 				</object>
 
 				<object size="100%-92 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 					<translatableAttribute id="caption">Send</translatableAttribute>
 					<action on="Press">submitChatInput();</action>
 				</object>
 			</object>
 
 			<!-- Tooltip -->
 			<object name="onscreenToolTip"
 				type="text"
 				font="sans-14"
 				textcolor="white"
 				sprite="BackgroundTranslucent"
 				size="20 100%-56 100%-312 100%-24"
 			/>
 
 			<!-- Cheat Warning Text -->
 			<object size="0 100%-52 100%-320 100%-24" name="cheatWarningText">
 				<object type="text" textcolor="red" style="ModernRightLabelText" size="0 0 100% 30">
 					<translatableAttribute id="caption">Cheats enabled.</translatableAttribute>
 				</object>
 			</object>
 
 			<!-- Start/Ready Button -->
 			<object
 				name="startGame"
 				type="button"
 				style="StoneButton"
 				size="100%-164 100%-52 100%-24 100%-24"
 				tooltip_style="onscreenToolTip"
 				z="21"
 			>
 				<action on="Press">
 					if (g_IsController)
 						launchGame();
 					else
 						toggleReady();
 				</action>
 			</object>
 
 			<!-- Cancel Button -->
 			<object
 				name="cancelGame"
 				type="button"
 				style="StoneButton"
 				size="100%-308 100%-52 100%-168 100%-24"
 				tooltip_style="onscreenToolTip"
 				z="21"
 			>
 				<translatableAttribute id="caption">Back</translatableAttribute>
 				<action on="Press">cancelSetup();</action>
 			</object>
 		</object>
 	</object>
 </objects>