diff --git a/api.go b/api.go index d6faf98..218dd0d 100644 --- a/api.go +++ b/api.go @@ -88,7 +88,9 @@ type MergeGetProgressPercent_Resp struct { } func MergeGetProgressPercent() (resp MergeGetProgressPercent_Resp) { - resp.IsRunning = gMergeIsRunning.Load() + gMergeIsRunningLocker.Lock() + resp.IsRunning = gMergeIsRunning + gMergeIsRunningLocker.Unlock() if resp.IsRunning { resp.Percent = gMergeStatus.GetPercent() resp.SpeedText = gMergeStatus.SpeedRecent5sGetAndUpdate()