Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(lib.waitFor): Improved Timeout Calculation and Error Message Formatting #518

Closed
wants to merge 2 commits into from
Closed

fix(lib.waitFor): Improved Timeout Calculation and Error Message Formatting #518

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5416e8
Removed redundancies & minor fixes
Kenshiin13 Mar 16, 2024
f75ff3f
Revert. Intended behaviour to allow "false" to be passed to wait inde…
Kenshiin13 Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions imports/waitFor/shared.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ 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 timeout or timeout == nil then
if type(timeout) ~= 'number' then timeout = 1000 end

if IsDuplicityVersion() then
timeout /= 50;
else
timeout -= GetFrameTime() * 1000;
end
end
if IsDuplicityVersion() then
timeout /= 50;
else
timeout /= (GetFrameTime() * 1000)
end
end


local start = GetGameTimer()
Expand All @@ -30,7 +29,7 @@ function lib.waitFor(cb, errMessage, timeout)
i += 1

if i > timeout then
return error(('%s (waited %.1fms)'):format(errMessage or 'failed to resolve callback', (GetGameTimer() - start) / 1000), 2)
return error(('%s (waited %dms)'):format(errMessage or 'failed to resolve callback', (GetGameTimer() - start)), 2)
end
end

Expand Down