Commit 0b0c57f

authored

Merge pull request #341 from SDWebImage/bugfix/progress_block_data_race

Fix the data race because progress block is called in non-main queue

2 parents 6c27d02 + 46407f9 commit 0b0c57fCopy full SHA for 0b0c57f

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public final class ImageManager : ObservableObject {`
`85`	`85`	`self.indicatorStatus.isLoading = true`
`86`	`86`	`self.indicatorStatus.progress = 0`
`87`	`87`	`currentOperation = manager.loadImage(with: url, options: options, context: context, progress: { [weak self] (receivedSize, expectedSize, _) in`
	`88`	`+ // This block may be called in non-main thread`
`88`	`89`	`guard let self = self else {`
`89`	`90`	`return`
`90`	`91`	`}`
`@@ -95,7 +96,11 @@ public final class ImageManager : ObservableObject {`
`95`	`96`	`progress = 0`
`96`	`97`	`}`
`97`	`98`	`self.indicatorStatus.progress = progress`
`98`		`- self.progressBlock?(receivedSize, expectedSize)`
	`99`	`+ if let progressBlock = self.progressBlock {`
	`100`	`+ DispatchQueue.main.async {`
	`101`	`+ progressBlock(receivedSize, expectedSize)`
	`102`	`+ }`
	`103`	`+ }`
`99`	`104`	`}) { [weak self] (image, data, error, cacheType, finished, _) in`
`100`	`105`	`guard let self = self else {`
`101`	`106`	`return`

Comments

(0)