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) = [];