From de94ffd75653403e1359bdcfd9df7110df6d8561 Mon Sep 17 00:00:00 2001
From: Salluci <69561145+Salluci@users.noreply.github.com>
Date: Sat, 25 Sep 2021 12:43:09 -0300
Subject: [PATCH] DAGR / Kestrel - Fix deviceKey condition (#8368)

* Fix DAGR keybind

* Fix Kestrel keybind

* Consistency with other deviceKey conditions
---
 addons/dagr/CfgVehicles.hpp         | 2 +-
 addons/dagr/initKeybinds.sqf        | 2 +-
 addons/kestrel4500/initKeybinds.sqf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp
index 6b0188a1783..562aeaa53ee 100644
--- a/addons/dagr/CfgVehicles.hpp
+++ b/addons/dagr/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
                     statement = QUOTE(call FUNC(menuInit));
                     showDisabled = 0;
                     icon = QPATHTOF(UI\DAGR_Icon.paa);
-                    exceptions[] = {"isNotInside", "isNotSitting"};
+                    exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
                     class GVAR(toggle) {
                         displayName = CSTRING(ToggleDAGR);
                         condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem));
diff --git a/addons/dagr/initKeybinds.sqf b/addons/dagr/initKeybinds.sqf
index d99e0f15c79..fb9d8dd7714 100644
--- a/addons/dagr/initKeybinds.sqf
+++ b/addons/dagr/initKeybinds.sqf
@@ -35,7 +35,7 @@ private _conditonCode = {
 };
 private _toggleCode = {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {};
+    if !([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false};
 
     // Statement
     [] call FUNC(toggleOverlay);
diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.sqf
index 8be74646151..fe0c23aa180 100644
--- a/addons/kestrel4500/initKeybinds.sqf
+++ b/addons/kestrel4500/initKeybinds.sqf
@@ -32,7 +32,7 @@ private _conditonCode = {
 };
 private _toggleCode = {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {};
+    if !([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false};
 
     // Statement
     if (!GVAR(Overlay)) then {