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.

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 for timer start method accessing private variable out of scope #591

Merged
merged 1 commit into from
Jun 1, 2024
Merged
Changes from all commits
Commits
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
18 changes: 6 additions & 12 deletions imports/timer/shared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,22 @@ function timer:start(async)

self.private.startTime = GetGameTimer()

local function tick(instance)
while true do
while instance.private.paused do
local function tick()
while self:getTimeLeft('ms') > 0 do
while self:isPaused() do
Wait(0)
end

if instance:getTimeLeft('ms') <= 0 then
break
end

Wait(0)
end
self:onEnd()
end

if async then
Citizen.CreateThreadNow(function()
tick(self)
self:onEnd()
tick()
end)
else
tick(self)
self:onEnd()
tick()
end
end

Expand Down