starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 17:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1472 from zImSkillz/main

Browse Source 
fix(es_extended/client/functions.lua): bug fix with the menu close & closeall function
This commit is contained in:
Kenshin13
2024-11-17 23:55:33 +01:00
committed by GitHub
parent 99f34fc678 5bddb7db65
commit 7cf36739a2
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/client/functions.lua
+12 -2
View File
@@ -389,7 +389,12 @@ function ESX.UI.Menu.Close(menuType, namespace, name, cancel)
if not cancel then
ESX.UI.Menu.Opened[i].close()
else
ESX.UI.Menu.Opened[i].cancel()
local menu = ESX.UI.Menu.Opened[i]
ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name)
if type(menu.cancel) ~= "nil" then
menu.cancel(menu.data, menu)
end
end
ESX.UI.Menu.Opened[i] = nil
end
@@ -405,7 +410,12 @@ function ESX.UI.Menu.CloseAll(cancel)
if not cancel then
ESX.UI.Menu.Opened[i].close()
else
ESX.UI.Menu.Opened[i].cancel()
local menu = ESX.UI.Menu.Opened[i]
ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name)
if type(menu.cancel) ~= "nil" then
menu.cancel(menu.data, menu)
end
end
ESX.UI.Menu.Opened[i] = nil
end