From 3dfef439e528bb4146eb85cf8cb906cd17cfab22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= <nicolas.d.badano@gmail.com>
Date: Wed, 11 Mar 2015 00:49:46 -0300
Subject: [PATCH] Delay the interactMenuClosed event until after the statement
 is executed, just in case it's needed to clean up afterwards.

---
 addons/interact_menu/functions/fnc_keyUp.sqf          | 11 ++++++-----
 .../interact_menu/functions/fnc_keyUpSelfAction.sqf   | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/interact_menu/functions/fnc_keyUp.sqf b/addons/interact_menu/functions/fnc_keyUp.sqf
index c983d5dfd2..70e7438125 100644
--- a/addons/interact_menu/functions/fnc_keyUp.sqf
+++ b/addons/interact_menu/functions/fnc_keyUp.sqf
@@ -12,17 +12,18 @@
  */
 #include "script_component.hpp"
 
-if (GVAR(keyDown)) then {
-    GVAR(keyDown) = false;
-    ["interactMenuClosed", [0]] call FUNC(localEvent);
-};
-
 if(GVAR(actionSelected)) then {
     this = GVAR(selectedTarget);
     _player = ACE_Player;
     _target = GVAR(selectedTarget);
     [GVAR(selectedTarget), ACE_player] call GVAR(selectedStatement);
 };
+
+if (GVAR(keyDown)) then {
+    GVAR(keyDown) = false;
+    ["interactMenuClosed", [0]] call FUNC(localEvent);
+};
+
 GVAR(expanded) = false;
 GVAR(lastPath) = [];
 GVAR(menuDepthPath) = [];
diff --git a/addons/interact_menu/functions/fnc_keyUpSelfAction.sqf b/addons/interact_menu/functions/fnc_keyUpSelfAction.sqf
index 807b05c657..924fd4cca6 100644
--- a/addons/interact_menu/functions/fnc_keyUpSelfAction.sqf
+++ b/addons/interact_menu/functions/fnc_keyUpSelfAction.sqf
@@ -16,17 +16,18 @@ if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
     closeDialog 0;
 };
 
-if (GVAR(keyDownSelfAction)) then {
-    GVAR(keyDownSelfAction) = false;
-    ["interactMenuClosed", [1]] call FUNC(localEvent);
-};
-
 if(GVAR(actionSelected)) then {
     this = GVAR(selectedTarget);
     _player = ACE_Player;
     _target = GVAR(selectedTarget);
     [GVAR(selectedTarget), ACE_player] call GVAR(selectedStatement);
 };
+
+if (GVAR(keyDownSelfAction)) then {
+    GVAR(keyDownSelfAction) = false;
+    ["interactMenuClosed", [1]] call FUNC(localEvent);
+};
+
 GVAR(expanded) = false;
 GVAR(lastPath) = [];
 GVAR(menuDepthPath) = [];