From 34b736c6f30a58b0867a0246f02e5be4536dd119 Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 3 Aug 2022 22:25:01 +0200 Subject: [PATCH 1/3] fix menu stuck on screen --- [esx_addons]/esx_joblisting/client/main.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/[esx_addons]/esx_joblisting/client/main.lua b/[esx_addons]/esx_joblisting/client/main.lua index d21c5a1d..01a81145 100644 --- a/[esx_addons]/esx_joblisting/client/main.lua +++ b/[esx_addons]/esx_joblisting/client/main.lua @@ -47,14 +47,10 @@ CreateThread(function() if distance < Config.DrawDistance then Sleep = 0 DrawMarker(Config.MarkerType, Config.Zones[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ZoneSize.x, Config.ZoneSize.y, Config.ZoneSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) - else - if menuIsShowed then - ESX.UI.Menu.CloseAll() - menuIsShowed = false - end end if distance < (Config.ZoneSize.x / 2) then + isInMarker = true ESX.ShowHelpNotification(_U('access_job_center')) if IsControlJustReleased(0, 38) and not menuIsShowed then ESX.UI.Menu.CloseAll() @@ -62,7 +58,13 @@ CreateThread(function() end end end - Wait(Sleep) + + if not isInMarker and menuIsShowed then + ESX.UI.Menu.CloseAll() + menuIsShowed = false + end + + Wait(Sleep) end end) From c133ac3a7b6492c3ca08cfda14a4097507bdbdea Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 3 Aug 2022 22:25:21 +0200 Subject: [PATCH 2/3] remove unused event --- [esx_addons]/esx_joblisting/client/main.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/[esx_addons]/esx_joblisting/client/main.lua b/[esx_addons]/esx_joblisting/client/main.lua index 01a81145..77370e98 100644 --- a/[esx_addons]/esx_joblisting/client/main.lua +++ b/[esx_addons]/esx_joblisting/client/main.lua @@ -29,10 +29,6 @@ function ShowJobListingMenu() end) end -AddEventHandler('esx_joblisting:hasExitedMarker', function(zone) - ESX.UI.Menu.CloseAll() -end) - -- Activate menu when player is inside marker, and draw markers CreateThread(function() while true do From b08cbc368da8060fe8b496023d364b974320526b Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 3 Aug 2022 22:26:40 +0200 Subject: [PATCH 3/3] isInMarker var local --- [esx_addons]/esx_joblisting/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_joblisting/client/main.lua b/[esx_addons]/esx_joblisting/client/main.lua index 77370e98..94e7a053 100644 --- a/[esx_addons]/esx_joblisting/client/main.lua +++ b/[esx_addons]/esx_joblisting/client/main.lua @@ -35,7 +35,7 @@ CreateThread(function() local Sleep = 1500 local coords = GetEntityCoords(PlayerPedId()) - isInMarker = false + local isInMarker = false for i=1, #Config.Zones, 1 do local distance = #(coords - Config.Zones[i])