fix(client): don't close menu when returning to "home"

overextended · Jul 26, 2023 · b834548 · b834548
1 parent 1b7feb6
commit b834548
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/api.lua b/client/api.lua
@@ -8,7 +8,7 @@
 ---@field groups? string | string[] | table<string, number>
 ---@field items? string | string[] | table<string, number>
 ---@field anyItem? boolean
----@field canInteract fun(entity?: number, distance: number, coords: vector3, name?: string, bone?: number): boolean?
+---@field canInteract? fun(entity?: number, distance: number, coords: vector3, name?: string, bone?: number): boolean?
 ---@field onSelect? fun(data: TargetOptions | number)
 ---@field export? string
 ---@field event? string

diff --git a/client/main.lua b/client/main.lua
@@ -325,7 +325,7 @@ local function startTargeting()
 end
 
 do
-    ---@type CKeybind
+    ---@type KeybindProps
     local keybind = {
         name = 'ox_target',
         defaultKey = GetConvar('ox_target:defaultHotkey', 'LMENU'),
@@ -417,6 +417,8 @@ RegisterNUICallback('select', function(data, cb)
         elseif option.command then
             ExecuteCommand(option.command)
         end
+
+        if option.menuName == 'home' then return end
     end
 
     if not option?.openMenu and IsNuiFocused() then