From 84cd80c41d43fbaaaef76032d2fefc1d790f93cb Mon Sep 17 00:00:00 2001 From: rcancro <@pinterest.com> Date: Fri, 28 Aug 2015 16:51:15 -0700 Subject: [PATCH] bug in setting the ASLayoutOptions default class. --- AsyncDisplayKit/Layout/ASLayoutOptions.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.m b/AsyncDisplayKit/Layout/ASLayoutOptions.m index a383d8497e..e0ebf622f5 100644 --- a/AsyncDisplayKit/Layout/ASLayoutOptions.m +++ b/AsyncDisplayKit/Layout/ASLayoutOptions.m @@ -27,8 +27,10 @@ static Class gDefaultLayoutOptionsClass = nil; { static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - // If someone is asking for this and it hasn't been customized yet, use the default. - gDefaultLayoutOptionsClass = [ASLayoutOptions class]; + if (gDefaultLayoutOptionsClass == nil) { + // If someone is asking for this and it hasn't been customized yet, use the default. + gDefaultLayoutOptionsClass = [ASLayoutOptions class]; + } }); return gDefaultLayoutOptionsClass; }