From f39678002fe615b9bb49e6c062ccc552550aa7aa Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Wed, 18 Jun 2025 12:02:03 +0100
Subject: [PATCH] Fix progressbars getting stuck on ox_lib

---
 shared/make/progressBars.lua | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/shared/make/progressBars.lua b/shared/make/progressBars.lua
index 758517f..4459bc8 100644
--- a/shared/make/progressBars.lua
+++ b/shared/make/progressBars.lua
@@ -78,12 +78,21 @@ function progressBar(data)
                 bone = data.propTwo.bone or 0
             }
         end
-        if data.progressType == "circle" then result = exports[OXLibExport]:progressCircle(options)
-        elseif data.progressType == "bar" then result = exports[OXLibExport]:progressBar(options)
-        else
-            result = exports[OXLibExport]:progressBar(options)
+        if data.progressType == "circle" then
+            if exports[OXLibExport]:progressCircle(options) then
+                result = true
+            else
+                result = false
+            end
         end
-        return result
+        if not data.progressType or data.progressType == "bar" then
+            if exports[OXLibExport]:progressBar(options) then
+                result = true
+            else
+                result = false
+            end
+        end
+
     elseif Config.System.ProgressBar == "qb" then
         Core.Functions.Progressbar("progbar",
             data.label,
@@ -200,7 +209,9 @@ function progressBar(data)
         inProgress = false
     end
 
-    while result == nil do Wait(10) end
+    while result == nil do
+        Wait(10)
+    end
 
     -- Cleanup
     FreezeEntityPosition(ped, false)
@@ -277,7 +288,7 @@ function stopProgressBar()
         exports[OXLibExport]:cancelProgress()
     elseif Config.System.ProgressBar == "qb" then
         TriggerEvent("progressbar:client:cancel")
-    elseif Config.System.ProgressBar == "gta" then
+    elseif Config.System.ProgressBar == "gta" or Config.System.ProgressBar == "red" then
         inProgress = false
     end
 end