fixes #4 workaround for racecondition

Author: Oliver Krüppel

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 0
 #define MINOR 3
-#define PATCH 2
+#define PATCH 3
 #define BUILD 0

addons/whitelist/functions/fn_checkRole.sqf

@@ -2,7 +2,8 @@
 
 params [
     ["_unit", objNull, [objNull]],
-    ["_vehicle", objNull, [objNull]]
+    ["_vehicle", objNull, [objNull]],
+    ["_role", "driver", [""]]
 ];
 
 scopeName "_main";
@@ -23,13 +24,13 @@ switch (_vehicleType) do {
     };
     case "Plane": {
         if ((typeOf _vehicle) in GVAR(attackAircraft)) then {
-            if (driver _vehicle isEqualTo _unit) then {
+            if (_role isEqualTo "driver") then {
                 if (ROLE_PLANE_ATTACK_PILOT in _roles) then { true breakOut "_main"; };
             } else {
                 if (ROLE_PLANE_ATTACK_CREW in _roles) then { true breakOut "_main"; };
             };
         } else {
-            if (driver _vehicle isEqualTo _unit) then {
+            if (_role isEqualTo "driver") then {
                 if (ROLE_PLANE_TRANSPORT_PILOT in _roles) then { true breakOut "_main"; };
             } else {
                 if (ROLE_PLANE_TRANSPORT_CREW in _roles) then { true breakOut "_main"; };
@@ -38,13 +39,13 @@ switch (_vehicleType) do {
     };
     case "Helicopter": {
         if ((typeOf _vehicle) in GVAR(attackAircraft)) then {
-            if (driver _vehicle isEqualTo _unit) then {
+            if (_role isEqualTo "driver") then {
                 if (ROLE_ROTARY_ATTACK_PILOT in _roles) then { true breakOut "_main"; };
             } else {
                 if (ROLE_ROTARY_ATTACK_CREW in _roles) then { true breakOut "_main"; };
             };
         } else {
-            if (driver _vehicle isEqualTo _unit) then {
+            if (_role isEqualTo "driver") then {
                 if (ROLE_ROTARY_TRANSPORT_PILOT in _roles) then { true breakOut "_main"; };
             } else {
                 if (ROLE_ROTARY_TRANSPORT_CREW in _roles) then { true breakOut "_main"; };

addons/whitelist/functions/fn_handleRoleCheck.sqf

@@ -2,15 +2,16 @@
 
 params [
     ["_unit", objNull, [objNull]],
-    ["_vehicle", objNull, [objNull]]
+    ["_vehicle", objNull, [objNull]],
+    ["_role", "cargo", [""]]
 ];
 
 if (isNull _unit) exitWith {};
 if (isNull _vehicle) exitWith {};
 //make sure we dont kick a player from a parachute or flying something
 if (! ([_vehicle] call FUNC(isValidVehicle))) exitWith {};
 
-if ([_unit, _vehicle] call FUNC(checkRole)) exitWith {};
+if ([_unit, _vehicle, _role] call FUNC(checkRole)) exitWith {};
 
 [_unit, "You are not on the correct slot to use this vehicle"] call FUNC(kickFromVehicle);
 

addons/whitelist/functions/fn_initPlayer.sqf

@@ -7,15 +7,16 @@ GVAR(uavList) = [];
 player addEventHandler ["SeatSwitchedMan", {
     params ["_unit1", "_unit2", "_vehicle"];
     if (!GVAR(enableWhitelist)) exitWith {};
-    if (([_unit2] call CBA_fnc_vehicleRole) isEqualTo "cargo") exitWith {};
-    [_unit2, _vehicle] remoteExecCall [QFUNC(handleRoleCheck), 2];
+    private _role = [_unit2] call CBA_fnc_vehicleRole;
+    if (_role isEqualTo "cargo") exitWith {};
+    [_unit2, _vehicle, _role] remoteExecCall [QFUNC(handleRoleCheck), 2];
 }];
 
 player addEventHandler ["GetInMan", {
     params ["_unit", "_role", "_vehicle", "_turret"];
     if (!GVAR(enableWhitelist)) exitWith {};
     if (_role isEqualTo "cargo") exitWith {};
-    [_unit, _vehicle] remoteExecCall [QFUNC(handleRoleCheck), 2];
+    [_unit, _vehicle, _role] remoteExecCall [QFUNC(handleRoleCheck), 2];
 }];
 
 [