From 1dfc4d50656cdb779ce026073a4ed8dce2ad128e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1ri=20Tristan=20Helgason?= Date: Thu, 3 Jan 2019 13:49:39 +0100 Subject: [PATCH] Fix bug in camera preview layer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously we were setting the property again in it's setter. This is obviously not a great idea. CL 109641 changed ivar accesses in blocks to property accesses and this bug got introduced there. Bug: webrtc:10110, webrtc:10127, webrtc:9971 Change-Id: I01abb0885b3bfc91fb741d82d1ece015ee9d3b58 Reviewed-on: https://webrtc-review.googlesource.com/c/116062 Reviewed-by: Peter Hanspers Commit-Queue: Kári Helgason Cr-Commit-Position: refs/heads/master@{#26124} --- sdk/objc/helpers/RTCCameraPreviewView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/objc/helpers/RTCCameraPreviewView.m b/sdk/objc/helpers/RTCCameraPreviewView.m index adc62cc30a..57dadea5c7 100644 --- a/sdk/objc/helpers/RTCCameraPreviewView.m +++ b/sdk/objc/helpers/RTCCameraPreviewView.m @@ -47,10 +47,10 @@ if (_captureSession == captureSession) { return; } + _captureSession = captureSession; [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeMain block:^{ - self.captureSession = captureSession; AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer]; [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession