Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Avoid calling AnnotationManager::updateStyle until the style is loaded #3070

Merged
merged 1 commit into from
Nov 19, 2015

Conversation

jfirebaugh
Copy link
Contributor

Fixes #3037

cc @incanus -- I stuck this on the 3.0.0 milestone / branch. It should be fairly safe but I'd be fine with waiting too.

@incanus
Copy link
Contributor

incanus commented Nov 19, 2015

Let's try it, with plans to pull it back out of release if it's problematic. But agree.

I'll merge now.

@incanus incanus added this to the ios-v3.0.0 milestone Nov 19, 2015
@incanus incanus force-pushed the 3037-style-annotation-race branch from d30e16c to 50a33e4 Compare November 19, 2015 00:04
@incanus incanus merged commit 50a33e4 into release-ios-v3.0.0 Nov 19, 2015
@incanus
Copy link
Contributor

incanus commented Nov 19, 2015

Cherry-picked to master as db1c4f2.

Thanks for opening this against the release branch @jfirebaugh — I've been cherry-picking in both directions as a result of us not consistently doing this.

@incanus incanus deleted the 3037-style-annotation-race branch November 19, 2015 00:06
@Zakay
Copy link

Zakay commented Nov 19, 2015

#3037 should be re-opened as it is still an issue after this commit, but appears much less now.
This issue appeared only after f9ebe54

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants