From ffd08627367afac1952bb7887f7170b383a55f20 Mon Sep 17 00:00:00 2001
From: Freddo3000 <f.falk@protonmail.com>
Date: Thu, 31 Jan 2019 18:21:08 +0100
Subject: [PATCH 1/2] Added check for CBA settings

CBA Settings function would get called despite CBA not being active, causing errors. #76
---
 Vcom/VcomInit.sqf  |  2 +-
 Vcom/changelog.txt | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Vcom/VcomInit.sqf b/Vcom/VcomInit.sqf
index 3705a01..9d49a16 100644
--- a/Vcom/VcomInit.sqf
+++ b/Vcom/VcomInit.sqf
@@ -14,7 +14,7 @@ if (isFilePatchingEnabled && {"" != loadFile "\userconfig\VCOM_AI\AISettingsV4.h
 {
 	[] call compile preprocessFileLineNumbers "\userconfig\VCOM_AI\AISettingsV4.hpp"; //Overwrite with userconfig
 };
-[] call VCM_fnc_CBA_Settings; //Overwrite with CBA settings
+if (isClass (configfile >> "CfgPatches" >> "cba_settings")) then {[] call VCM_fnc_CBA_Settings}; //Overwrite with CBA settings
 
 //Mod checks
 //ACE CHECK
diff --git a/Vcom/changelog.txt b/Vcom/changelog.txt
index fc19e1a..168b9b8 100644
--- a/Vcom/changelog.txt
+++ b/Vcom/changelog.txt
@@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [3.2.1] - 2019-01-31
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- CBA settings would get called despite CBA not being active
+
+### Security
+
+
 ## [3.2] - 2019-01-20
 ### Added
 - VCOM Driving (Experimental)

From e0dea13dc4949ae983b76344a25ed70d6fbdc1ea Mon Sep 17 00:00:00 2001
From: Freddo3000 <f.falk@protonmail.com>
Date: Wed, 6 Feb 2019 18:36:43 +0100
Subject: [PATCH 2/2] Fixed FFE error

Wrongly place "getText", probably from invalid merge.
---
 Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf b/Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf
index 2c362a6..f7ab07d 100644
--- a/Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf
+++ b/Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf
@@ -117,7 +117,7 @@ params ["_allArty"];
 						
 						if ((isText _subAmmo) and {not ((getText _subAmmo) isEqualTo "")}) then
 						{
-							_ammoC = configfile >> "CfgAmmo" >> (getText _subAmmo);
+							_ammoC = configfile >> "CfgAmmo" >> _subAmmo;
 						};
 					
 						_actHit = getNumber (_ammoC >> "indirectHit");