From 43dc1f020e69022ca2a2603af5316a7289875285 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas@users.noreply.github.com>
Date: Sun, 12 Mar 2017 05:49:54 +0100
Subject: [PATCH] Fix vehicle lock lockpick condition, Fix lockpicking from
 inside (#4985)

---
 addons/vehiclelock/functions/fnc_lockpick.sqf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/vehiclelock/functions/fnc_lockpick.sqf b/addons/vehiclelock/functions/fnc_lockpick.sqf
index 3ac7385a04..2ce856dd37 100644
--- a/addons/vehiclelock/functions/fnc_lockpick.sqf
+++ b/addons/vehiclelock/functions/fnc_lockpick.sqf
@@ -51,9 +51,11 @@ if (!([[_unit, _veh]] call _condition)) exitWith {false};
 
 _returnValue = _funcType in ["canLockpick", "startLockpick", "finishLockpick"];
 switch (_funcType) do {
-    case "canLockpick": {};
+    case "canLockpick": {
+        _returnValue = !([_unit, _veh] call FUNC(hasKeyForVehicle)) && {(locked _veh) in [2, 3]};
+    };
     case "startLockpick": {
-        [_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize LSTRING(Action_LockpickInUse)), _condition] call EFUNC(common,progressBar);
+        [_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize LSTRING(Action_LockpickInUse)), _condition, ["isNotInside"]] call EFUNC(common,progressBar);
     };
     case "finishLockpick": {
         [QGVAR(setVehicleLock), [_veh, false], [_veh]] call CBA_fnc_targetEvent;