From 7d7aa5b67f1a748a2a3c6a1defe3d8c20436ddd4 Mon Sep 17 00:00:00 2001
From: BaerMitUmlaut <florian.foss@gmail.com>
Date: Wed, 28 Oct 2015 17:15:46 +0100
Subject: [PATCH] !hasHatch condition part 2

---
 addons/nightvision/functions/fnc_onVisionModeChanged.sqf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/nightvision/functions/fnc_onVisionModeChanged.sqf b/addons/nightvision/functions/fnc_onVisionModeChanged.sqf
index d14e504dc8..64f77a69bc 100644
--- a/addons/nightvision/functions/fnc_onVisionModeChanged.sqf
+++ b/addons/nightvision/functions/fnc_onVisionModeChanged.sqf
@@ -20,8 +20,11 @@
 params ["_unit", "_visionMode"];
 
 if (GVAR(disableNVGsWithSights) && {(hmd _unit) != ""}) then {
-    (assignedVehicleRole _unit) params ["_role", "_turretPath"];
-    if ((vehicle _unit == _unit) || {isTurnedOut _unit} || {_role == "cargo" && {!(isNil "_turretPath")}}) then {
+    if ((vehicle _unit == _unit)
+        || {isTurnedOut _unit}
+        || {!([_unit] call EFUNC(common,hasHatch))
+            && {[_unit] call EFUNC(common,getTurretIndex) in ([vehicle _unit] call EFUNC(common,getTurretsFFV))}
+           }) then {
         if ((cameraView == "GUNNER") && {_visionMode > 0}) then {
             _unit action ["NVGogglesOff", _unit];
         };