parent
a5352a067e
commit
c49ab965e2
4
api.go
4
api.go
|
|
@ -88,7 +88,9 @@ type MergeGetProgressPercent_Resp struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func MergeGetProgressPercent() (resp MergeGetProgressPercent_Resp) {
|
func MergeGetProgressPercent() (resp MergeGetProgressPercent_Resp) {
|
||||||
resp.IsRunning = gMergeIsRunning.Load()
|
gMergeIsRunningLocker.Lock()
|
||||||
|
resp.IsRunning = gMergeIsRunning
|
||||||
|
gMergeIsRunningLocker.Unlock()
|
||||||
if resp.IsRunning {
|
if resp.IsRunning {
|
||||||
resp.Percent = gMergeStatus.GetPercent()
|
resp.Percent = gMergeStatus.GetPercent()
|
||||||
resp.SpeedText = gMergeStatus.SpeedRecent5sGetAndUpdate()
|
resp.SpeedText = gMergeStatus.SpeedRecent5sGetAndUpdate()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue