diff --git a/Carthage b/Carthage index b316e4e26..d69c75bfc 160000 --- a/Carthage +++ b/Carthage @@ -1 +1 @@ -Subproject commit b316e4e26362bb86605cd3743d513ea8a57e66bf +Subproject commit d69c75bfcf8a7387c86f30c563f788c59b94a66f diff --git a/Signal/src/views/RemoteVideoView.m b/Signal/src/views/RemoteVideoView.m index aa7f885ce..a52f935f1 100644 --- a/Signal/src/views/RemoteVideoView.m +++ b/Signal/src/views/RemoteVideoView.m @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) __kindof UIView *videoRenderer; // Used for legacy EAGLVideoView -@property (nullable, nonatomic) NSMutableArray *remoteVideoConstraints; +@property (nullable, nonatomic) NSArray *remoteVideoConstraints; @end @@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN return self; } + _remoteVideoConstraints = @[]; + // Currently RTC only supports metal on 64bit machines #if defined(RTC_SUPPORTS_METAL) // On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance. @@ -142,7 +144,7 @@ NS_ASSUME_NONNULL_BEGIN [constraints addObjectsFromArray:[videoView autoPinEdgesToSuperviewEdges]]; } - self.remoteVideoConstraints = constraints; + self.remoteVideoConstraints = [constraints copy]; // We need to force relayout to occur immediately (and not // wait for a UIKit layout/render pass) or the remoteVideoView // (which presumably is updating its CALayer directly) will