ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-16 11:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue that could cause the view / layer to be created early by -clearContents.

Browse Source
This commit is contained in:
Scott Goodson 2015-11-19 17:10:06 -08:00
parent 59d52ced3f
commit 18dffb41e8
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -1644,7 +1644,8 @@ void recursivelyEnsureDisplayForLayer(CALayer *layer)
- (void)clearContents - (void)clearContents
{ {
self.layer.contents = nil; // No-op if these haven't been created yet, as that guarantees they don't have contents that needs to be released.
_layer.contents = nil;
_placeholderLayer.contents = nil; _placeholderLayer.contents = nil;
_placeholderImage = nil; _placeholderImage = nil;
} }

16
examples/SocialAppLayout/Sample.xcodeproj/project.pbxproj
View File

@ -204,7 +204,6 @@
3EEA4EE01BECC4A1008A7F35 /* Sources */, 3EEA4EE01BECC4A1008A7F35 /* Sources */,
3EEA4EE11BECC4A1008A7F35 /* Frameworks */, 3EEA4EE11BECC4A1008A7F35 /* Frameworks */,
3EEA4EE21BECC4A1008A7F35 /* Resources */, 3EEA4EE21BECC4A1008A7F35 /* Resources */,
F8CD1BCEB86661EF98DB1C0C /* Embed Pods Frameworks */,
21F2C1D9B53F9468EAF1653F /* Copy Pods Resources */, 21F2C1D9B53F9468EAF1653F /* Copy Pods Resources */,
); );
buildRules = ( buildRules = (
@ -311,21 +310,6 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
F8CD1BCEB86661EF98DB1C0C /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */