From fca8614c1878dffe8fd2b2274a83d469b391aa48 Mon Sep 17 00:00:00 2001
From: Adlai Holler <guy.on.internet@icloud.com>
Date: Sun, 29 Nov 2015 21:22:37 -0800
Subject: [PATCH] Scope like a boss

---
 AsyncDisplayKit/ASMultiplexImageNode.mm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/AsyncDisplayKit/ASMultiplexImageNode.mm b/AsyncDisplayKit/ASMultiplexImageNode.mm
index 53ee08ef28..f72fbdce39 100644
--- a/AsyncDisplayKit/ASMultiplexImageNode.mm
+++ b/AsyncDisplayKit/ASMultiplexImageNode.mm
@@ -276,16 +276,15 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
 
 - (void)setImageIdentifiers:(NSArray *)imageIdentifiers
 {
-  _imageIdentifiersLock.lock();
+  {
+    ASDN::MutexLocker l(_imageIdentifiersLock);
+    if (ASObjectIsEqual(_imageIdentifiers, imageIdentifiers)) {
+      return;
+    }
 
-  if (ASObjectIsEqual(_imageIdentifiers, imageIdentifiers)) {
-    _imageIdentifiersLock.unlock();
-    return;
+    _imageIdentifiers = [[NSArray alloc] initWithArray:imageIdentifiers copyItems:YES];
   }
 
-  _imageIdentifiers = [[NSArray alloc] initWithArray:imageIdentifiers copyItems:YES];
-  _imageIdentifiersLock.unlock();
-
   if (self.interfaceState & ASInterfaceStateFetchData) {
     [self fetchData];
   }