From 349e0a103d3a3fbafd6f4e8f5d4147d603f63ebf Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Wed, 4 May 2016 16:46:35 -0400
Subject: [PATCH] Fix trade title showing "Buying in vehicleX" when in sell
 mode

Tested and confirmed working as intended now.
---
 .../AdvancedTrading/functions/z_at_checkArrayInConfig.sqf | 2 +-
 .../AdvancedTrading/functions/z_at_checkCloseVehicle.sqf  | 8 +++++++-
 .../AdvancedTrading/functions/z_at_getContainer.sqf       | 2 +-
 SQF/dayz_code/stringtable.xml                             | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf
index ce84d81a1..fe4ad95f6 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf
@@ -14,7 +14,7 @@ _weaps = _this select 0;
 _mags = _this select 1;
 _extraText = _this select 2;
 _vehTrade = false;
-if (call Z_checkCloseVehicle) then {
+if (false call Z_checkCloseVehicle) then {
 	_all = _weaps + _mags + [(typeOf Z_vehicle)];
 	_vehTrade = true;
 } else {
diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf
index 5b70f02a2..eee025253 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf
@@ -13,6 +13,12 @@ if(!isNull _vehicle)then{
 	Z_vehicle = _vehicle;
 	systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf Z_vehicle];
 	_result = true;
-	[format[localize "STR_EPOCH_TRADE_BUYING_IN", typeOf Z_vehicle]] call Z_filleTradeTitle;
+	if (_this) then { // Set trade title, don't set on menu start up since gear is selected initially.
+		if (Z_Selling) then {
+			[format[localize "STR_EPOCH_TRADE_SELLING_FROM", typeOf Z_vehicle]] call Z_filleTradeTitle;
+		} else {
+			[format[localize "STR_EPOCH_TRADE_BUYING_IN", typeOf Z_vehicle]] call Z_filleTradeTitle;
+		};
+	};
 };
 _result
diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf
index 913c25413..776bbd8f9 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf
@@ -54,7 +54,7 @@ if(Z_Selling)then{
 		case 1: {
 			Z_SellingFrom = 1;
 			[localize "STR_EPOCH_TRADE_BUYING_VEHICLE"] call Z_filleTradeTitle;
-			_canBuyInVehicle = call Z_checkCloseVehicle;
+			_canBuyInVehicle = true call Z_checkCloseVehicle;
 			if(_canBuyInVehicle)then{
 				[1] call Z_calculateFreeSpace;
 			}else{
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 2c8fc6ddd..42bb06d34 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -15794,6 +15794,9 @@
 			<English>Buying in %1.</English>
 			<Russian>Покупка в %1.</Russian>
 		</Key>
+		<Key ID="STR_EPOCH_TRADE_SELLING_FROM">
+			<English>Selling from %1.</English>
+		</Key>
 		<Key ID="STR_EPOCH_TRADE_TOTAL_SPACE_SUCCEEDED">
 			<English>Total space succeeded: Mag=1, Tool=1, Side=5, Primary=10 slots and your bag capacity is %1 where you tried %2 slots.</English>
 		</Key>