Merge pull request #99 from pjay/fix-retain-cycle

Fix a retain cycle in render operation closure

Author: fulldecent

CHANGELOG.md

@@ -14,6 +14,8 @@ All notable changes to this project will be documented in this file.
   [#76](https://github.com/fulldecent/FDWaveformView/issues/86).
 
 #### Fixed
+- Fixed a retain cycle in completion handler of waveform render operation
+  - Added by [Philippe Jayet](https://github.com/pjay)
 - Cancel waveform render operation when view is released
   - Added by [Philippe Jayet](https://github.com/pjay)
 

Source/FDWaveformView.swift

@@ -420,15 +420,17 @@ open class FDWaveformView: UIView {
         let imageSize = CGSize(width: widthInPixels, height: heightInPixels)
         let renderFormat = FDWaveformRenderFormat(type: waveformRenderType, wavesColor: .black, scale: desiredImageScale)
 
-        let waveformRenderOperation = FDWaveformRenderOperation(audioContext: audioContext, imageSize: imageSize, sampleRange: renderSamples, format: renderFormat) { image in
+        let waveformRenderOperation = FDWaveformRenderOperation(audioContext: audioContext, imageSize: imageSize, sampleRange: renderSamples, format: renderFormat) { [weak self] image in
             DispatchQueue.main.async {
-                self.renderForCurrentAssetFailed = (image == nil)
-                self.waveformImage = image
-                self.renderingInProgress = false
-                self.cachedWaveformRenderOperation = self.inProgressWaveformRenderOperation
-                self.inProgressWaveformRenderOperation = nil
-                self.setNeedsLayout()
-                self.delegate?.waveformViewDidRender?(self)
+                guard let strongSelf = self else { return }
+                
+                strongSelf.renderForCurrentAssetFailed = (image == nil)
+                strongSelf.waveformImage = image
+                strongSelf.renderingInProgress = false
+                strongSelf.cachedWaveformRenderOperation = self?.inProgressWaveformRenderOperation
+                strongSelf.inProgressWaveformRenderOperation = nil
+                strongSelf.setNeedsLayout()
+                strongSelf.delegate?.waveformViewDidRender?(strongSelf)
             }
         }
         self.inProgressWaveformRenderOperation = waveformRenderOperation