From ec93fba84a7ad8440db79e1567dbffd350d5387f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sun, 5 Jul 2015 01:35:04 -0700 Subject: Fixed crash on launch on iOS 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In #1793, I conflated the compass container’s constraints to its parent view with the compass container’s content size constraints, but only in the iOS 7 code path. The result was a crash on launch due to an unprepared view hierarchy. Fixes #1818. --- platform/ios/MGLMapView.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 06a2ef36be..cd6ab6ad9f 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -539,7 +539,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) multiplier:1 constant:5]]; - [compassContainerConstraints addObject: + [compassContainer addConstraint: [NSLayoutConstraint constraintWithItem:compassContainer attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual @@ -548,7 +548,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) multiplier:1 constant:self.compassView.image.size.width]]; - [compassContainerConstraints addObject: + [compassContainer addConstraint: [NSLayoutConstraint constraintWithItem:compassContainer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual @@ -562,7 +562,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) } else { - [compassContainer addConstraints:compassContainerConstraints]; + [constraintParentView addConstraints:compassContainerConstraints]; } // logo bug -- cgit v1.2.1