From a399ef4acf1d25c930fa1c1fb10dfcd246c103dc Mon Sep 17 00:00:00 2001
From: Michael Schneider <mischneider1@gmail.com>
Date: Tue, 6 Dec 2016 06:55:47 -0800
Subject: [PATCH] Some video node improvements

---
 AsyncDisplayKit/ASVideoNode.mm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AsyncDisplayKit/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm
index 86e19ebe..afd133a6 100644
--- a/AsyncDisplayKit/ASVideoNode.mm
+++ b/AsyncDisplayKit/ASVideoNode.mm
@@ -472,7 +472,7 @@ static NSString * const kRate = @"rate";
   ASDN::MutexLocker l(__instanceLock__);
 
   if (ASObjectIsEqual(assetURL, self.assetURL) == NO) {
-    [self _setAndFetchAsset:[AVURLAsset assetWithURL:assetURL] url:assetURL];
+    [self locked_setAndFetchAsset:[AVURLAsset assetWithURL:assetURL] url:assetURL];
   }
 }
 
@@ -494,7 +494,7 @@ static NSString * const kRate = @"rate";
   ASDN::MutexLocker l(__instanceLock__);
   
   if (ASAssetIsEqual(asset, _asset) == NO) {
-    [self _setAndFetchAsset:asset url:nil];
+    [self locked_setAndFetchAsset:asset url:nil];
   }
 }
 
@@ -504,10 +504,10 @@ static NSString * const kRate = @"rate";
   return _asset;
 }
 
-- (void)_setAndFetchAsset:(AVAsset *)asset url:(NSURL *)assetURL
+- (void)locked_setAndFetchAsset:(AVAsset *)asset url:(NSURL *)assetURL
 {
-  [self setVideoPlaceholderImage:nil];
   [self didExitPreloadState];
+  self.videoPlaceholderImage = nil;
   _asset = asset;
   _assetURL = assetURL;
   [self setNeedsPreload];