Merge pull request #1842 from seltonmt012/fix/progressbar-timing

fix(esx_progressbar): honour the requested duration and ignore cancelled runs

[core]/esx_progressbar/Progress.lua

@@ -9,11 +9,12 @@
 ---@field public onFinish? function
 
 local CurrentProgress = nil
+local progressCount = 0
 
-local function startProcessing()
+local function startProcessing(id)
-    while (CurrentProgress ~= nil) do
+    while CurrentProgress ~= nil and CurrentProgress.id == id do
-        if CurrentProgress.length > 0 then
+        if GetGameTimer() < CurrentProgress.finishAt then
-            CurrentProgress.length = CurrentProgress.length - 1000
+            Wait(50)
         else
             ClearPedTasks(ESX.PlayerData.ped)
             if CurrentProgress.FreezePlayer then
@@ -24,7 +25,6 @@ local function startProcessing()
             end
             CurrentProgress = nil
         end
-        Wait(1000)
     end
 end
 
@@ -55,8 +55,15 @@ local function Progressbar(message, length, Options)
         length = length or 3000,
         message = message or "ESX-Framework",
     })
+    progressCount = progressCount + 1
+    CurrentProgress.id = progressCount
     CurrentProgress.length = length or 3000
-    CreateThread(startProcessing);
+    CurrentProgress.finishAt = GetGameTimer() + CurrentProgress.length
+
+    local id = progressCount
+    CreateThread(function()
+        startProcessing(id)
+    end)
     return true;
 end