FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-17 06:56:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(waitFor): use GetGameTimer to timeout callbacks

Browse Source 
Corrected error message output to ms.
Resolves #518.
This commit is contained in:
Linden
2024-03-18 18:48:57 +11:00
parent 591fb022f9
commit 2190cd32f4
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
imports/waitFor/shared.lua
View File

@@ -10,31 +10,21 @@ function lib.waitFor(cb, errMessage, timeout)
if value ~= nil then return value end
if timeout or timeout == nil then
if type(timeout) ~= 'number' then timeout = 1000 end
if IsDuplicityVersion() then
timeout /= 50;
else
timeout -= GetFrameTime() * 1000;
end
end
local start = GetGameTimer()
local i = 0
local start = timeout and GetGameTimer()
while value == nil do
if timeout then
i += 1
Wait(0)
if i > timeout then
return error(('%s (waited %.1fms)'):format(errMessage or 'failed to resolve callback', (GetGameTimer() - start) / 1000), 2)
end
local elapsed = timeout and GetGameTimer() - start
if elapsed and elapsed > timeout then
return error(('%s (waited %.1fms)'):format(errMessage or 'failed to resolve callback', elapsed), 2)
end
Wait(0)
value = cb()
end